5 files changed, 78 insertions, 58 deletions
diff --git a/graphics/vertex/files/patch-Makefile b/graphics/vertex/files/patch-Makefile
new file mode 100644
index 000000000000..0bcc3f185501
--- /dev/null
+++ b/graphics/vertex/files/patch-Makefile
@@ -0,0 +1,30 @@
+
+$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.Linux b/graphics/vertex/files/patch-Makefile.Linux
deleted file mode 100644
index 18e3737df39e..000000000000
--- a/graphics/vertex/files/patch-Makefile.Linux
+++ /dev/null
@@ -1,52 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.Linux.orig	Thu May 17 11:28:46 2001
-+++ Makefile.Linux	Mon Jun 11 15:44:54 2001
-@@ -18,7 +18,7 @@
- #   You may modify any value as needed. Change only the ones you are
- #   absolutly sure that requires modification.
- #
--PREFIX = /usr
-+PREFIX ?= /usr
- 
- 
- # ########################################################################
-@@ -70,7 +70,9 @@
- #				to debug the program.
- #
- 
--CFLAGS = -DHAVE_IMLIB `gtk-config --cflags` -O -g -Wall
-+GTK_CFLAGS != $(GTK_CONFIG) --cflags
-+CFLAGS += -DHAVE_IMLIB -DHAVE_GTKGLAREA -DUSE_XSHM $(GTK_CFLAGS) -Wall \
-+          -DPREFIX=\"${PREFIX}\"
- 
- CPPFLAGS = -D__cplusplus -Dc_plusplus
- 
-@@ -86,10 +88,12 @@
- #   to the LIB line depending on what you have set in the CFLAGS line
- #   farther above.
- #
-+GTK_LIBS != $(GTK_CONFIG) --libs
-+IMLIB_LIBS != $(X11BASE)/bin/imlib-config --libs
- LIB = -lm \
--      -lImlib -lpng -ltiff -lgif -ljpeg \
--      `gtk-config --libs` \
--      -lGLU -lGL \
-+      $(IMLIB_LIBS) \
-+      $(GTK_LIBS) \
-+      -lGLU -lGL $(PTHREAD_LIBS) \
-       -lgtkgl \
-       -lz
- 
-@@ -121,8 +125,8 @@
- #
- include Makefile.srclist
- 
--CC  = gcc
--CPP = g++
-+CC  ?= gcc
-+CPP = $(CXX)
- BIN = vertex
- OBJ_C = $(SRC_C:.c=.o)
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
diff --git a/graphics/vertex/files/patch-Makefile.install.UNIX b/graphics/vertex/files/patch-Makefile.install.UNIX
index 20dc39213cbb..177ae22e5bd3 100644
--- a/graphics/vertex/files/patch-Makefile.install.UNIX
+++ b/graphics/vertex/files/patch-Makefile.install.UNIX
@@ -1,27 +1,31 @@
 
 $FreeBSD$
 
---- Makefile.install.UNIX	2001/06/01 17:28:56	1.1
-+++ Makefile.install.UNIX	2001/06/01 17:32:30
-@@ -28,17 +28,19 @@
- 
+--- 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:
+-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 help preset_models preset_primitives
++.for subd in images help preset_models preset_primitives
 +	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/$(subd)
 +	$(BSD_INSTALL_DATA) data/$(subd)/* $(DATA_DIR)/$(subd)
 +.endfor
diff --git a/graphics/vertex/files/patch-Makefile.srclist b/graphics/vertex/files/patch-Makefile.srclist
new file mode 100644
index 000000000000..3e7031f3ffa2
--- /dev/null
+++ b/graphics/vertex/files/patch-Makefile.srclist
@@ -0,0 +1,12 @@
+
+$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-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c
new file mode 100644
index 000000000000..d597ca08d93e
--- /dev/null
+++ b/graphics/vertex/files/patch-vmahelp.c
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- vmahelp.c	2001/10/05 17:31:12	1.1
++++ vmahelp.c	2001/10/05 17:33:21
+@@ -41,16 +41,12 @@
+  */
+ #define HELP_PROG_LOCATIONS	\
+ { \
+- "/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, \
+ \
+- "/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, \
+ \
+- "/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, \
+ \
+  NULL, NULL, NULL \
+ }