1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

- Update to 3.1g.2

- Remove pkg-plist for use of PLIST_FILES and PORTDOCS

PR:		ports/77947
Submitted by:	Sam Lawrance <boris@brooknet.com.au>
This commit is contained in:
Michael Johnson 2005-03-02 07:37:09 +00:00
parent 1e5e6d293a
commit d85be14663
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130154
6 changed files with 73 additions and 87 deletions

View File

@ -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,17 @@ RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 \
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
PLIST_FILES= bin/x-pvmpov \
lib/pvm/bin/FREEBSD/x-pvmpov
pre-configure:
@ (cd ${WRKDIRPREFIX}${.CURDIR}/../../graphics/povray31/work && \
${TAR} -c -f - povray31 ) \
@ -42,12 +49,11 @@ do-build:
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>

View File

@ -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

View File

@ -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 @@
#define MAX_HELP_PAGE 7
!
-!
+
--- 39,50 ----
- #define POV_RAY_VERSION "3.1e"
+ #define POV_RAY_VERSION "3.1g"
/*****************************************************************************
- * 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

View File

@ -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 \

View File

@ -1,14 +0,0 @@
--- povray31/source/pvm/pvm.h.orig Sun Sep 12 01:25:35 1999
+++ povray31/source/pvm/pvm.h Wed Mar 22 13:04:15 2000
@@ -23,9 +23,9 @@
* add it in permanently.
*/
-#include <features.h>
+/*#include <features.h>*/
-#if defined(SUN4SOL2) || defined(your_pvm_arch)
+#if defined(SUN4SOL2) || defined(__FreeBSD__)
#define NICE(x) nice(x)
extern int nice PARAMS((int prio));

View File

@ -1,9 +0,0 @@
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