10 files changed, 121 insertions, 118 deletions

diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index 64be134580df..a02b17656239 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -6,38 +6,54 @@
 #
 
 PORTNAME=	vertex
-PORTVERSION=	0.1.10
+PORTVERSION=	0.1.15
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A 3D modeller designed specifically for generating efficient game models
 
-LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/vertex
-
-IMLIB_CONFIG?=	${X11BASE}/bin/imlib-config
+LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GNOME=	imlib
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		IMLIB_CONFIG="${IMLIB_CONFIG}"
-INSTALL_TARGET=	vertex_install
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	UNIX
 
 MAN1=		${PORTNAME}.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-pre-patch:
-	@${FIND} ${WRKSRC} -name "*.[c,h]" | ${XARGS} ${PERL} -pi -e \
-		's|malloc.h|stdlib.h|'
-
-.include <bsd.port.post.mk>
+post-patch:
+	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|malloc\.h|stdlib.h|g'
+	@${REINPLACE_CMD} -e \
+		's|make|$$(MAKE)|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/vertex|${DATADIR}|g' ${WRKSRC}/vertex/config.h
+	@${REINPLACE_CMD} -e \
+		's|echo -n -e|printf|g' ${WRKSRC}/vertex/makefile_append.ini
+	@${REINPLACE_CMD} -e \
+		's|%%CC%%|${CC}|g ; \
+		 s|%%CXX%%|${CXX}|g ; \
+		 s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
+		 s|%%PREFIX%%|${PREFIX}|g ; \
+		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/platforms.ini
+	@${REINPLACE_CMD} -e \
+		's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/vmahelp.c
+	@${REINPLACE_CMD} -e \
+		's|CC =|CC ?=|g' ${WRKSRC}/pconf/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/vertex/vertex ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/vertex/vertex.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/vertex/vertex.xpm ${DATADIR}/icons
+	cd ${WRKSRC}/vertex/data && ${FIND} . -type f | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	@${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+x
+
+.include <bsd.port.mk>
diff --git a/graphics/vertex/distinfo b/graphics/vertex/distinfo
index e3d93e9f0fe8..b111f7c684d3 100644
--- a/graphics/vertex/distinfo
+++ b/graphics/vertex/distinfo
@@ -1 +1 @@
-MD5 (vertex-0.1.10.tar.bz2) = f564e8df587f5b52428164ee2e42a481
+MD5 (vertex-0.1.15.tar.bz2) = 22a1528d8fed58682d645cf572c823b6
diff --git a/graphics/vertex/files/patch-Makefile b/graphics/vertex/files/patch-Makefile
deleted file mode 100644
index 0bcc3f185501..000000000000
--- a/graphics/vertex/files/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Fri Oct  5 20:20:24 2001
-+++ Makefile	Fri Oct  5 20:34:15 2001
-@@ -0,0 +1,24 @@
-+PREFIX?= /usr/X11R6
-+X11BASE?= /usr/X11R6
-+BIN= vertex
-+
-+GTK_CONFIG?= gtk12-config
-+IMLIB_CONFIG?= imlib-config
-+
-+GTK_CFLAGS!= ${GTK_CONFIG} --cflags
-+GTK_LIBS!= ${GTK_CONFIG} --libs
-+IMLIB_CFLAGS!= ${IMLIB_CONFIG} --cflags
-+IMLIB_LIBS!= ${IMLIB_CONFIG} --libs
-+PTHREAD_LIBS?= -pthread
-+
-+PROG= ${BIN}
-+SRCS!= ${MAKE} -f ${.CURDIR}/Makefile.srclist srclist
-+CFLAGS+= -DHAVE_IMLIB ${GTK_CFLAGS} ${IMLIB_CFLAGS} -DPREFIX=\"${PREFIX}\" \
-+	 -DX11BASE=\"${X11BASE}\"
-+CXXFLAGS= ${CFLAGS}
-+LDADD+= ${GTK_LIBS} ${IMLIB_LIBS} -lGLU -lGL $(PTHREAD_LIBS) -lgtkgl \
-+	-lz
-+MAN1=
-+
-+.include <bsd.prog.mk>
-+.include "Makefile.install.UNIX"
diff --git a/graphics/vertex/files/patch-Makefile.install.UNIX b/graphics/vertex/files/patch-Makefile.install.UNIX
deleted file mode 100644
index 177ae22e5bd3..000000000000
--- a/graphics/vertex/files/patch-Makefile.install.UNIX
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.install.UNIX.orig	Fri Sep 14 01:36:54 2001
-+++ Makefile.install.UNIX	Fri Oct  5 20:44:38 2001
-@@ -29,19 +29,21 @@
- BIN_DIR   = $(PREFIX)/bin
- MAN_DIR   = $(PREFIX)/man/man1
- DATA_DIR  = $(PREFIX)/share/$(BIN)
--ICONS_DIR = $(PREFIX)/share/icons
-+ICONS_DIR = $(PREFIX)/share/$(BIN)/icons
- 
- HR = "-------------------------------------------------------------------------"
- 
--install:
-+vertex_install:
- 	$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
--	$(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR)
-+	$(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR)
- 	$(MKDIR) $(MKDIRFLAGS) $(MAN_DIR)
--	$(INSTALL) $(INSTMANFLAGS) $(BIN).1 $(MAN_DIR)
-+	$(BSD_INSTALL_MAN) $(BIN).1 $(MAN_DIR)
- 	$(MKDIR) $(MKDIRFLAGS) $(ICONS_DIR)
--	$(INSTALL) $(INSTDATFLAGS) $(BIN).xpm $(ICONS_DIR)
--	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
--	$(COPY) -r data/* $(DATA_DIR)
-+	$(BSD_INSTALL_DATA) $(BIN).xpm $(ICONS_DIR)
-+.for subd in images help preset_models preset_primitives
-+	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/$(subd)
-+	$(BSD_INSTALL_DATA) data/$(subd)/* $(DATA_DIR)/$(subd)
-+.endfor
- 	@echo $(HR)
- 	@echo "Program $(BIN) installed in:"
- 	@echo " "
diff --git a/graphics/vertex/files/patch-Makefile.srclist b/graphics/vertex/files/patch-Makefile.srclist
deleted file mode 100644
index 3e7031f3ffa2..000000000000
--- a/graphics/vertex/files/patch-Makefile.srclist
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.srclist.orig	Fri Sep 14 01:36:54 2001
-+++ Makefile.srclist	Fri Oct  5 20:14:43 2001
-@@ -34,3 +34,6 @@
-         vpiinternal.c vpiinternalfio.c
- SRC_CPP = disk.cpp fio.cpp prochandle.cpp strexp.cpp string.cpp tga.cpp \
-           tgadither.cpp
-+
-+srclist:
-+	@echo ${HDR} ${SRC_C} ${SRC_CPP}
diff --git a/graphics/vertex/files/patch-config.h b/graphics/vertex/files/patch-config.h
deleted file mode 100644
index 4959730f74d9..000000000000
--- a/graphics/vertex/files/patch-config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- config.h	2001/06/01 17:19:04	1.1
-+++ config.h	2001/06/01 17:19:54
-@@ -53,7 +53,7 @@
- /*
-  *	File and directory paths:
-  */
--#define VMA_DEF_DATA_GLOBAL_DIR		"/usr/share/vertex"
-+#define VMA_DEF_DATA_GLOBAL_DIR		(PREFIX "/share/vertex")
- 
- /* Local data directory, user's home dir will be prefixed. */
- #define VMA_DEF_DATA_LOCAL_DIR		".vertex"
diff --git a/graphics/vertex/files/patch-messages.h b/graphics/vertex/files/patch-messages.h
new file mode 100644
index 000000000000..0d37f1570c6b
--- /dev/null
+++ b/graphics/vertex/files/patch-messages.h
@@ -0,0 +1,11 @@
+--- vertex/messages.h.orig	Wed Oct  1 06:44:17 2003
++++ vertex/messages.h	Tue Oct 21 23:29:45 2003
+@@ -22,7 +22,7 @@
+ \n\
+     [file] is the V3D model file to load on startup.\n\
+ \n\
+-    [options] can be any of the following:
++    [options] can be any of the following:\n\
+ \n\
+         --rcfile <file>         Load configuration from <file>.\n\
+         --config_file <file>    Same as --rcfile.\n\
diff --git a/graphics/vertex/files/patch-platforms.ini b/graphics/vertex/files/patch-platforms.ini
new file mode 100644
index 000000000000..c6490082f2b6
--- /dev/null
+++ b/graphics/vertex/files/patch-platforms.ini
@@ -0,0 +1,65 @@
+--- vertex/platforms.ini.orig	Wed Oct  1 06:44:17 2003
++++ vertex/platforms.ini	Tue Oct 21 22:05:42 2003
+@@ -22,23 +22,23 @@
+ 
+ Platform = UNIX
+         Description = For most any UNIX system
+-        PREFIX = /usr/
+-        CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math \
++        PREFIX = %%PREFIX%%
++        CFLAGS = %%CXXFLAGS%% \
+ -D__USE_BSD
+         LIBS = -lm
+         LIB_DIR =
+-	CC = cc
+-	CPP = c++
++	CC = %%CC%%
++	CPP = %%CXX%%
+         PlatformSearchPathInclude = /usr/include/
+-        PlatformSearchPathInclude = /usr/X11R6/include/
++        PlatformSearchPathInclude = %%X11BASE%%/include/
+         PlatformSearchPathLib = /lib/
+         PlatformSearchPathLib = /usr/lib/
+-        PlatformSearchPathLib = /usr/X11R6/lib/
++        PlatformSearchPathLib = %%X11BASE%%/lib/
+         PlatformSearchPathEtc = /etc/
+         PlatformSearchPathEtc = /usr/etc/
+         PlatformSearchPathBin = /bin/
+         PlatformSearchPathBin = /usr/bin/
+-        PlatformSearchPathBin = /usr/X11R6/bin/
++        PlatformSearchPathBin = %%X11BASE%%/bin/
+         PlatformSearchPathData = /usr/share/icons/
+         PlatformFeature = debug
+                 Description = Just adds -g to the CFLAGS for debugging
+@@ -51,7 +51,7 @@
+ # Newer versions of Imlib only need to link to -lImlib
+ #		FeatureLIBS = -lImlib -lpng -ltiff -ljpeg -lz
+ 		FeatureLIBS = -lImlib
+-                FeatureLIB_DIR = -L/usr/X11R6/lib/
++                FeatureLIB_DIR = -L%%X11BASE%%/lib/
+                 FeatureDepend = Imlib-lib
+                         DependType = Library
+                         MustExist = Yes
+@@ -83,11 +83,11 @@
+                 MustExist = Yes
+                 FeatureCFLAGS = `gtk-config --cflags`
+                 FeatureLIBS = `gtk-config --libs`
+-		FeatureLIB_DIR = -L/usr/X11R6/lib/
++		FeatureLIB_DIR = -L%%X11BASE%%/lib/
+                 FeatureDepend = gtk-lib
+                         DependType = Library
+                         MustExist = Yes
+-                        DependPath = libgtk.so
++                        DependPath = libgtk12.so
+                         DependGrepString = gtk_init
+                 FeatureDepend = gtk-devel
+                         DependType = Program
+@@ -98,7 +98,7 @@
+                 MustExist = Yes
+                 FeatureCFLAGS =
+                 FeatureLIBS = -lgtkgl
+-                FeatureLIB_DIR = -L/usr/X11R6/lib/
++                FeatureLIB_DIR = -L%%X11BASE%%/lib/
+                 FeatureDepend = gtkgl-lib
+                         DependType = Library
+                         MustExist = Yes
diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c
index d597ca08d93e..11789bbc9265 100644
--- a/graphics/vertex/files/patch-vmahelp.c
+++ b/graphics/vertex/files/patch-vmahelp.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- vmahelp.c	2001/10/05 17:31:12	1.1
-+++ vmahelp.c	2001/10/05 17:33:21
+--- vertex/vmahelp.c	2001/10/05 17:31:12	1.1
++++ vertex/vmahelp.c	2001/10/05 17:33:21
 @@ -41,16 +41,12 @@
   */
  #define HELP_PROG_LOCATIONS	\
@@ -10,17 +10,17 @@ $FreeBSD$
 - "/usr/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/usr/local/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ (X11BASE "/bin/gnome-help-browser"), "", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%X11BASE%%/bin/gnome-help-browser", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
  \
 - "/usr/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/usr/local/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ (X11BASE "/bin/netscape"), "", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%X11BASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \
  \
 - "/usr/X11R6/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
 - "/usr/X11R6/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ (X11BASE "/bin/nxterm"), "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
-+ (X11BASE "/bin/xterm"), "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%X11BASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
++ "%%X11BASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \
  \
   NULL, NULL, NULL \
  }
diff --git a/graphics/vertex/pkg-plist b/graphics/vertex/pkg-plist
index 59f4faa3e927..186a100483c5 100644
--- a/graphics/vertex/pkg-plist
+++ b/graphics/vertex/pkg-plist
@@ -1,4 +1,5 @@
 bin/vertex
+share/vertex/LICENSE
 share/vertex/help/application_map.png
 share/vertex/help/contacts.html
 share/vertex/help/create_model_dialog.png