diff options
| -rw-r--r-- | x11-toolkits/v/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/v/distinfo | 3 | ||||
| -rw-r--r-- | x11-toolkits/v/files/patch-configs-ConfigX.mk | 54 | ||||
| -rw-r--r-- | x11-toolkits/v/files/patch-includex-v-v_defs.h | 10 | ||||
| -rw-r--r-- | x11-toolkits/v/files/patch-includex-v-vtimer.h | 18 | ||||
| -rw-r--r-- | x11-toolkits/v/files/patch-srcx-vtimer.cxx | 11 |
6 files changed, 74 insertions, 28 deletions
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile index 83f20e0..8e63916 100644 --- a/x11-toolkits/v/Makefile +++ b/x11-toolkits/v/Makefile @@ -10,6 +10,8 @@ PORTVERSION= 1.90 CATEGORIES= x11-toolkits devel graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= vgui +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-${PORTVERSION}a-patch${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= A C++ GUI development framework for X11 and Microsoft Windows @@ -19,6 +21,7 @@ WRKSRC= ${WRKDIR}/home/vgui USE_X_PREFIX= YES USE_GMAKE= YES MAKE_ENV= INSTALLDIR=${PREFIX} HOMEV=${WRKSRC} +USE_DOS2UNIX= yes .include <bsd.port.pre.mk> @@ -45,7 +48,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/libVx.a ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/lib/libVxgl.a ${PREFIX}/lib ${MKDIR} ${PREFIX}/include/v - ${INSTALL_DATA} ${WRKSRC}/includex/v/* ${PREFIX}/include/v + ${INSTALL_DATA} ${WRKSRC}/includex/v/*.h ${PREFIX}/include/v + ${INSTALL_DATA} ${WRKSRC}/includex/v/*.cxx ${PREFIX}/include/v post-install: ${RANLIB} ${PREFIX}/lib/libVx.a diff --git a/x11-toolkits/v/distinfo b/x11-toolkits/v/distinfo index fe56460..6814526 100644 --- a/x11-toolkits/v/distinfo +++ b/x11-toolkits/v/distinfo @@ -1,3 +1,6 @@ MD5 (v-1.90.tar.gz) = 7eec3b3b72dc78d600eb8d8c2ef03fec SHA256 (v-1.90.tar.gz) = c6eacb3b3463e60522d8756abf7c39d30753b595bc110453d40f5f082f69ce40 SIZE (v-1.90.tar.gz) = 1334360 +MD5 (v-1.90a-patch.tar.gz) = f564be4914ffe52837254657cec01cdf +SHA256 (v-1.90a-patch.tar.gz) = 799614292df0df2117ac196eb75b95042d6021ec8249603e61fcfa66abb817ee +SIZE (v-1.90a-patch.tar.gz) = 5970 diff --git a/x11-toolkits/v/files/patch-configs-ConfigX.mk b/x11-toolkits/v/files/patch-configs-ConfigX.mk index 73746e3..584ad2e 100644 --- a/x11-toolkits/v/files/patch-configs-ConfigX.mk +++ b/x11-toolkits/v/files/patch-configs-ConfigX.mk @@ -1,32 +1,32 @@ --- configs/ConfigX.mk.orig Thu Apr 3 18:14:40 2003 +++ configs/ConfigX.mk Mon Mar 6 23:53:38 2006 @@ -51,7 +51,7 @@ - # User contributed definitions are available for:
- # hpux, aix, solaris, bsd
- #---------------------------------------------------------------------
--ARCH = linuxdev
-+#ARCH = linuxdev
- #ARCH = linux
- #ARCH = linuxelf
- #ARCH = sun4
+ # User contributed definitions are available for: + # hpux, aix, solaris, bsd + #--------------------------------------------------------------------- +-ARCH = linuxdev ++#ARCH = linuxdev + #ARCH = linux + #ARCH = linuxelf + #ARCH = sun4 @@ -60,9 +60,9 @@ - #ARCH = hpux
- #ARCH = aix
- #ARCH = solaris
--#ARCH = bsd
-+ARCH = bsd
- #ARCH = tru64
--Arch = $(ARCH)
-+Arch = bsd
-
-
- #---------------------------------------------------------------------
+ #ARCH = hpux + #ARCH = aix + #ARCH = solaris +-#ARCH = bsd ++ARCH = bsd + #ARCH = tru64 +-Arch = $(ARCH) ++Arch = bsd + + + #--------------------------------------------------------------------- @@ -307,7 +307,7 @@ - ifeq ($(Arch),bsd)
- INCDIR += -I/usr/$(X11RV)/include
- LIBDIR += -L/usr/$(X11RV)/lib
--LIBS += -lV -lXmu -lXt -lXext -lX11 -lxm
-+LIBS += -lXmu -lXt -lXext -lX11
- TARZ =
- RANLIB = ranlib
- VGPATH = UNIX
+ ifeq ($(Arch),bsd) + INCDIR += -I/usr/$(X11RV)/include + LIBDIR += -L/usr/$(X11RV)/lib +-LIBS += -lV -lXmu -lXt -lXext -lX11 -lxm ++LIBS += -lXmu -lXt -lXext -lX11 + TARZ = + RANLIB = ranlib + VGPATH = UNIX diff --git a/x11-toolkits/v/files/patch-includex-v-v_defs.h b/x11-toolkits/v/files/patch-includex-v-v_defs.h new file mode 100644 index 0000000..4f442b5 --- /dev/null +++ b/x11-toolkits/v/files/patch-includex-v-v_defs.h @@ -0,0 +1,10 @@ +--- includex/v/v_defs.h.orig Mon Apr 28 19:16:56 2003 ++++ includex/v/v_defs.h Thu Mar 9 19:03:12 2006 +@@ -310,6 +310,7 @@ + #define notChk 0 + #define noSub 0 + #define notUsed 0 ++#define notUsedVoid + #define noIcon 0 + + // standard menu definitions diff --git a/x11-toolkits/v/files/patch-includex-v-vtimer.h b/x11-toolkits/v/files/patch-includex-v-vtimer.h new file mode 100644 index 0000000..91ef038 --- /dev/null +++ b/x11-toolkits/v/files/patch-includex-v-vtimer.h @@ -0,0 +1,18 @@ +--- includex/v/vtimer.h.orig Fri Apr 4 23:37:28 2003 ++++ includex/v/vtimer.h Thu Mar 9 19:05:20 2006 +@@ -19,13 +19,13 @@ + + extern "C" + { +- void CtimerCB(XtPointer client_data, XtIntervalId* notUsed); ++ void CtimerCB(XtPointer client_data, XtIntervalId* notUsedVoid); + } + + class vTimer + { + +- friend void CtimerCB(XtPointer client_data, XtIntervalId* notUsed); ++ friend void CtimerCB(XtPointer client_data, XtIntervalId* notUsedVoid); + + public: //---------------------------------------- public + diff --git a/x11-toolkits/v/files/patch-srcx-vtimer.cxx b/x11-toolkits/v/files/patch-srcx-vtimer.cxx new file mode 100644 index 0000000..beb7e42 --- /dev/null +++ b/x11-toolkits/v/files/patch-srcx-vtimer.cxx @@ -0,0 +1,11 @@ +--- srcx/vtimer.cxx.orig Fri Apr 4 23:37:00 2003 ++++ srcx/vtimer.cxx Thu Mar 9 19:06:58 2006 +@@ -95,7 +95,7 @@ + extern "C" + { + //============================>>> CtimerCB <<<========================== +- void CtimerCB(XtPointer client_data, XtIntervalId* notUsed) ++ void CtimerCB(XtPointer client_data, XtIntervalId* notUsedVoid) + { + // timer tick callback + // |
