Date: Wed, 23 Feb 2005 14:58:15 +1100 (EST) From: Sam Lawrance <boris@brooknet.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77947: [PATCH] graphics/pvmpov: update to 3.1g.2 Message-ID: <20050223035815.9B55E175F@localhost> Resent-Message-ID: <200502230400.j1N40fXF001139@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77947
>Category: ports
>Synopsis: [PATCH] graphics/pvmpov: update to 3.1g.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 23 04:00:41 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Sam Lawrance
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Feb 9 00:12:24 EST
>Description:
- Update to 3.1g.2
- Adjust plist, use PORTDOCS
- Remove files/patch-ac
DID YOU KNOW: the patch below is a patch to a patch to a patch!
How did the original porter do it? :)
>How-To-Repeat:
>Fix:
--- pvmpov-3.1g.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/pvmpov/Makefile,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile
--- Makefile 5 Apr 2004 05:04:26 -0000 1.10
+++ Makefile 23 Feb 2005 03:44:47 -0000
@@ -6,11 +6,11 @@
#
PORTNAME= pvmpov
-PORTVERSION= 3.1e.2
+PORTVERSION= 3.1g.2
CATEGORIES= graphics parallel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-3.1e2
+DISTNAME= ${PORTNAME}-3.1g2
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
@@ -24,10 +24,14 @@
USE_PERL5_BUILD=yes
USE_XLIB= yes
-WRKSRC= ${WRKDIR}/pvmpov3_1e_2
+WRKSRC= ${WRKDIR}/pvmpov3_1g_2
BUILDBASE= ${WRKSRC}/povray31/source/pvm
PVM_ROOT= ${LOCALBASE}/lib/pvm
+.if !defined(NOPORTDOCS)
+PORTDOCS= *
+.endif
+
pre-configure:
@ (cd ${WRKDIRPREFIX}${.CURDIR}/../../graphics/povray31/work && \
${TAR} -c -f - povray31 ) \
@@ -42,12 +46,11 @@
do-install:
@ ${MKDIR} ${PVM_ROOT}/bin/FREEBSD
- @ ${MKDIR} ${PREFIX}/share/doc/pvmpov
@ ${INSTALL_PROGRAM} ${BUILDBASE}/FREEBSD/x-pvmpov ${PVM_ROOT}/bin/FREEBSD
@ ${LN} -sf ${PVM_ROOT}/bin/FREEBSD/x-pvmpov ${PREFIX}/bin/x-pvmpov
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${PREFIX}/share/doc/pvmpov
- @ ${INSTALL_MAN} ${WRKSRC}/PVM* ${PREFIX}/share/doc/pvmpov
+ @ ${MKDIR} ${DOCSDIR}
+ @ ${INSTALL_DATA} ${WRKSRC}/doc/PVMPOV-HOWTO.html ${DOCSDIR}
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/pvmpov/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo 29 Jan 2004 07:24:28 -0000 1.2
+++ distinfo 22 Feb 2005 12:26:30 -0000
@@ -1,2 +1,2 @@
-MD5 (pvmpov-3.1e2.tgz) = d2648d49bf0a500dc39cd9b2fb08e3dd
-SIZE (pvmpov-3.1e2.tgz) = 37424
+MD5 (pvmpov-3.1g2.tgz) = 79fed3e1c3278a4754a5bf705a3d5a73
+SIZE (pvmpov-3.1g2.tgz) = 41114
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/pvmpov/pkg-plist,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 pkg-plist
--- pkg-plist 29 May 2000 08:47:48 -0000 1.1.1.1
+++ pkg-plist 23 Feb 2005 03:53:36 -0000
@@ -1,9 +1,2 @@
bin/x-pvmpov
lib/pvm/bin/FREEBSD/x-pvmpov
-share/doc/pvmpov/PVMPOV.Changelog
-share/doc/pvmpov/PVMPOV.benchmark
-share/doc/pvmpov/PVMPOV.example
-share/doc/pvmpov/PVMPOV.general
-share/doc/pvmpov/PVMPOV.install
-share/doc/pvmpov/PVMPOV.radiosity
-@dirrm share/doc/pvmpov
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/pvmpov/files/patch-aa,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-aa
--- files/patch-aa 29 May 2000 08:47:48 -0000 1.1.1.1
+++ files/patch-aa 23 Feb 2005 03:33:10 -0000
@@ -1,28 +1,61 @@
---- pvmpov.patch.orig Sun Sep 12 01:25:35 1999
-+++ pvmpov.patch Wed Mar 22 12:37:19 2000
-@@ -569,10 +569,10 @@
+--- pvmpov.patch.orig Sat Sep 8 00:29:33 2001
++++ pvmpov.patch Wed Feb 23 14:32:36 2005
+@@ -579,9 +579,9 @@
+
+ /* Print redirecting options. */
+
+-diff -r -c ../povray31/source/optout.h povray31/source/optout.h
+-*** ../povray31/source/optout.h Mon Nov 22 04:24:23 1999
+---- povray31/source/optout.h Thu Sep 6 14:29:51 2001
++diff -r -c povray31/source/optout.h.orig povray31/source/optout.h
++*** povray31/source/optout.h.orig Tue Feb 22 23:47:08 2005
++--- povray31/source/optout.h Wed Feb 23 14:27:00 2005
+ ***************
+ *** 19,24 ****
+ --- 19,27 ----
+@@ -595,29 +595,28 @@
+
***************
- *** 36,47 ****
-- #define POV_RAY_VERSION "3.1e"
-+ #define POV_RAY_VERSION "3.1g"
+-*** 36,49 ****
++*** 36,48 ****
+ #define POV_RAY_VERSION "3.1g"
- #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
--! #define DISTRIBUTION_MESSAGE_2 "FILL IN NAME HERE........................."
+- #define DISTRIBUTION_MESSAGE_2 "FILL IN NAME HERE........................."
+ #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled for"
-+! #define DISTRIBUTION_MESSAGE_2 "FreeBSD, http://www.freebsd.org/"
++ #define DISTRIBUTION_MESSAGE_2 "FreeBSD, http://www.freebsd.org/"
#define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version."
/* Number of help pages (numbered 0 to MAX_HELP_PAGE). */
-@@ -582,9 +582,9 @@
-
- --- 39,50 ----
-- #define POV_RAY_VERSION "3.1e"
-+ #define POV_RAY_VERSION "3.1g"
+ #define MAX_HELP_PAGE 7
+ !
+-!
++
+
+ /*****************************************************************************
+- * Global typedefs
+ --- 39,58 ----
+ #define POV_RAY_VERSION "3.1g"
- #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
+ #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled for"
- ! #define DISTRIBUTION_MESSAGE_2 "Jakob Flierl <flierl@luga.de> - PVMPOV Version 3.1e.2"
+ + #ifdef PVM
+ + #define DISTRIBUTION_MESSAGE_2 "Jakob Flierl <flierl@luga.de> - PVMPOV Version 3.1g.2"
+ + #else
+- #define DISTRIBUTION_MESSAGE_2 "FILL IN NAME HERE........................."
++ #define DISTRIBUTION_MESSAGE_2 "FreeBSD, http://www.freebsd.org/"
+ + #endif
#define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version."
+@@ -629,8 +628,8 @@
+ #define MAX_HELP_PAGE 7
+ ! #endif
+
++
+ /*****************************************************************************
+- * Global typedefs
+ diff -r -c ../povray31/source/povray.c povray31/source/povray.c
+ *** ../povray31/source/povray.c Sat May 1 15:01:26 1999
+ --- povray31/source/povray.c Thu Sep 6 14:23:55 2001
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/graphics/pvmpov/files/patch-ab,v
retrieving revision 1.2
diff -u -u -r1.2 patch-ab
--- files/patch-ab 17 Dec 2003 20:06:15 -0000 1.2
+++ files/patch-ab 22 Feb 2005 14:29:00 -0000
@@ -1,6 +1,6 @@
---- povray31/source/pvm/Makefile.aimk.orig Sun Sep 12 00:25:35 1999
-+++ povray31/source/pvm/Makefile.aimk Wed Dec 17 21:02:49 2003
-@@ -63,18 +63,18 @@
+--- povray31/source/pvm/Makefile.aimk.orig Sat Sep 8 00:29:33 2001
++++ povray31/source/pvm/Makefile.aimk Wed Feb 23 01:28:26 2005
+@@ -45,18 +45,18 @@
# Use libXXX.a if you want to force static linking of the libraries.
# Use -Llibdir -lXXX if you want to use shared libraries (if they are
# available). It doesn't matter if you only have libXXX.a libraries.
@@ -24,58 +24,28 @@
+ZLIBLIB = -lz
#ZLIBLIB = -L/usr/local/lib -lz
+ #
+@@ -77,7 +77,7 @@
+ # for some AIX systems
+ #X11 = /usr/lpp/X11
-@@ -92,7 +92,7 @@
- #X11 = /usr/local/X11R6
- #X11 = /usr/openwin # for some SunOS systems
- #X11 = /usr/lpp/X11 # for some AIX systems
-X11 = /usr/X11R6
+X11 = %X11BASE%
# You probably won't need to change these if you have the X11 variable
- # above set properly...
-@@ -127,28 +127,27 @@
- #
+ # above set properly...
+@@ -115,11 +115,10 @@
CC = gcc
OBJ = .o
+
-PVMINC = -I$(PVM_ROOT)/include
-PVMLIB = $(PVM_ROOT)/lib/$(PVM_ARCH)/libpvm3.a \
- $(PVM_ROOT)/lib/$(PVM_ARCH)/libgpvm3.a
+PVMINC = -I%LOCALBASE%/include
+PVMLIB = -L%LOCALBASE%/lib -lpvm3 -lgpvm3
- #PVMLIB = /usr/lib/libpvm3.a \
- # /usr/lib/libgpvm3.a
XDIR = $(HOME)/pvm3/bin/$(PVM_ARCH)
--CFLAGS = -O6 -m486 -ansi -finline-functions -ffast-math -c -Wall \
+-CFLAGS = -O3 -ansi -finline-functions -ffast-math -c -Wall \
+CFLAGS = -O6 -ansi -finline-functions -ffast-math -c -Wall \
- -DCOMPILER_VER=\".`uname`.$(CC)\" \
+ -DPVM -D$(PVM_ARCH) -DCOMPILER_VER=\".`uname`.$(CC)\" \
+ -DPOV_LIB_DIR=\"$(POVLIBDIR)\" \
$(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
- LFLAGS = $(PVMLIB) $(LIBPNGLIB) $(ZLIBLIB) -lm
-
- # some other possibilities for CFLAGS
- #CFLAGS = -O2 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" \
-- $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
-+# $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
- # HPUX compiler flags
- #CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE \
-- -DCOMPILER_VER=\".`uname`.$(CC)\" \
-- $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
-+# -DCOMPILER_VER=\".`uname`.$(CC)\" \
-+# $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
- # ALPHA compiler flags
- #CFLAGS = -O6 -ansi -finline-functions -c -Wall \
-- -DCOMPILER_VER=\".`uname`.$(CC)\" \
-- $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)$(SRCINC)
-+# -DCOMPILER_VER=\".`uname`.$(CC)\" \
-+# $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)$(SRCINC)
-
- #
- # and additional file needed for PVM
-@@ -1079,7 +1078,6 @@
- config.h \
- $(SRCDIR)/frame.h \
- $(SRCDIR)/optout.h \
-- $(PNGDIR)/png.h \
- $(SRCDIR)/png_pov.h \
- $(SRCDIR)/point.h \
- $(SRCDIR)/povproto.h \
--- pvmpov-3.1g.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050223035815.9B55E175F>