Date: Wed, 22 Oct 2003 23:45:13 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58382: Update port: graphics/vertex to 0.1.15 Message-ID: <20031022234513.2db7b74a.tkato@prontomail.com> Resent-Message-ID: <200310221450.h9MEoIQW011601@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58382 >Category: ports >Synopsis: Update port: graphics/vertex to 0.1.15 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 22 07:50:18 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: >Environment: >Description: - Update to version 0.1.15 New file: files/patch-messages.h files/patch-platforms.ini Remove file: files/patch-Makefile files/patch-Makefile.install.UNIX files/patch-Makefile.srclist files/patch-configure >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/vertex/Makefile graphics/vertex/Makefile --- /usr/ports/graphics/vertex/Makefile Thu Oct 16 19:38:40 2003 +++ graphics/vertex/Makefile Tue Oct 21 23:20:54 2003 @@ -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|' +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.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/graphics/vertex/distinfo graphics/vertex/distinfo --- /usr/ports/graphics/vertex/distinfo Tue Sep 10 20:12:55 2002 +++ graphics/vertex/distinfo Wed Oct 8 22:56:18 2003 @@ -1 +1 @@ -MD5 (vertex-0.1.10.tar.bz2) = f564e8df587f5b52428164ee2e42a481 +MD5 (vertex-0.1.15.tar.bz2) = 22a1528d8fed58682d645cf572c823b6 diff -urN /usr/ports/graphics/vertex/files/patch-Makefile graphics/vertex/files/patch-Makefile --- /usr/ports/graphics/vertex/files/patch-Makefile Sat Oct 6 02:46:18 2001 +++ graphics/vertex/files/patch-Makefile Thu Jan 1 09:00:00 1970 @@ -1,30 +0,0 @@ - -$FreeBSD: ports/graphics/vertex/files/patch-Makefile,v 1.1 2001/10/05 17:46:18 sobomax Exp $ - ---- 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 -urN /usr/ports/graphics/vertex/files/patch-Makefile.install.UNIX graphics/vertex/files/patch-Makefile.install.UNIX --- /usr/ports/graphics/vertex/files/patch-Makefile.install.UNIX Sat Oct 6 02:46:18 2001 +++ graphics/vertex/files/patch-Makefile.install.UNIX Thu Jan 1 09:00:00 1970 @@ -1,34 +0,0 @@ - -$FreeBSD: ports/graphics/vertex/files/patch-Makefile.install.UNIX,v 1.2 2001/10/05 17:46:18 sobomax Exp $ - ---- 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 -urN /usr/ports/graphics/vertex/files/patch-Makefile.srclist graphics/vertex/files/patch-Makefile.srclist --- /usr/ports/graphics/vertex/files/patch-Makefile.srclist Sat Oct 6 02:46:18 2001 +++ graphics/vertex/files/patch-Makefile.srclist Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ - -$FreeBSD: ports/graphics/vertex/files/patch-Makefile.srclist,v 1.1 2001/10/05 17:46:18 sobomax Exp $ - ---- 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 -urN /usr/ports/graphics/vertex/files/patch-config.h graphics/vertex/files/patch-config.h --- /usr/ports/graphics/vertex/files/patch-config.h Sat Jun 2 03:00:00 2001 +++ graphics/vertex/files/patch-config.h Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/graphics/vertex/files/patch-config.h,v 1.1 2001/06/01 18:00:00 sobomax Exp $ - ---- 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 -urN /usr/ports/graphics/vertex/files/patch-messages.h graphics/vertex/files/patch-messages.h --- /usr/ports/graphics/vertex/files/patch-messages.h Thu Jan 1 09:00:00 1970 +++ graphics/vertex/files/patch-messages.h Tue Oct 21 23:30:02 2003 @@ -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 -urN /usr/ports/graphics/vertex/files/patch-platforms.ini graphics/vertex/files/patch-platforms.ini --- /usr/ports/graphics/vertex/files/patch-platforms.ini Thu Jan 1 09:00:00 1970 +++ graphics/vertex/files/patch-platforms.ini Tue Oct 21 23:20:35 2003 @@ -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 -urN /usr/ports/graphics/vertex/files/patch-vmahelp.c graphics/vertex/files/patch-vmahelp.c --- /usr/ports/graphics/vertex/files/patch-vmahelp.c Sat Oct 6 02:46:18 2001 +++ graphics/vertex/files/patch-vmahelp.c Tue Oct 21 22:51:42 2003 @@ -1,8 +1,8 @@ $FreeBSD: ports/graphics/vertex/files/patch-vmahelp.c,v 1.1 2001/10/05 17:46:18 sobomax Exp $ ---- 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 @@ - "/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 -urN /usr/ports/graphics/vertex/pkg-plist graphics/vertex/pkg-plist --- /usr/ports/graphics/vertex/pkg-plist Sat Oct 6 02:46:17 2001 +++ graphics/vertex/pkg-plist Tue Oct 21 22:37:32 2003 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031022234513.2db7b74a.tkato>