Update to 3.6.1

This commit is contained in:
Maho Nakata 2004-11-23 03:23:46 +00:00
parent d7fcc8234e
commit af75880137
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=122197
30 changed files with 3633 additions and 4812 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= povray
PORTVERSION= 3.5
PORTREVISION= 3
PORTVERSION= 3.6.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.gigabell.net/pub/unix/apps/graphics/povray/%SUBDIR%/ \
@ -15,9 +14,7 @@ MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.fh-aachen.de/pub/mirror/ftp.povray.org/povray/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
MASTER_SITE_SUBDIR= Official/Unix
DISTNAME= povuni_s
EXTRACT_SUFX= .tgz
DIST_SUBDIR= povray35
DIST_SUBDIR= povray36
MAINTAINER= maho@FreeBSD.org
COMMENT= Persistence of Vision Ray Tracer
@ -25,7 +22,6 @@ COMMENT= Persistence of Vision Ray Tracer
.if defined(WITH_ICC)
BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
.endif
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg
@ -33,12 +29,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-3.50c
USE_XLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
LATEST_LINK= ${PORTNAME}35
USE_AUTOCONF_VER= 259
LATEST_LINK= ${PORTNAME}36
.if defined(WITH_OPTIMIZED_FLAGS)
CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
@ -57,34 +53,25 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib
.endif
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --x-includes=${X11BASE}/include
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include"
CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \
CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \
--disable-optimiz
MAN1= povray.1
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
BROKEN= "Does not compile on i386"
.endif
post-patch:
@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
#@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
#@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
.if !defined(WITH_OPTIMIZED_FLAGS)
@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
.endif
do-install:
@(cd ${WRKSRC} ; ${GMAKE} install-exec)
@(cd ${WRKSRC} ; ${GMAKE} install-data)
.if !defined(NOPORTDOCS)
@(cd ${WRKSRC} ; ${GMAKE} install-docDATA)
@(cd ${WRKSRC}/doc ; ${GMAKE} install)
.endif
@${RM} -f ${PREFIX}/man/man1/povray.1*
@${INSTALL_MAN} ${WRKSRC}/doc/povray.1 ${PREFIX}/man/man1
@(cd ${WRKSRC} ; ${GMAKE} install)
post-install:
@${SED} -e 's,/usr/local,${PREFIX},g' ${DESCR}

View file

@ -1,2 +1,2 @@
MD5 (povray35/povuni_s.tgz) = bac59e7a86172a5bd0c63af2516e7045
SIZE (povray35/povuni_s.tgz) = 6602380
MD5 (povray36/povray-3.6.1.tar.gz) = 6d0da1ab9f7a6374d67d6554337311ee
SIZE (povray36/povray-3.6.1.tar.gz) = 9032066

View file

@ -1,56 +0,0 @@
--- Makefile.in.orig Tue Oct 22 09:54:06 2002
+++ Makefile.in Sun Nov 17 23:56:45 2002
@@ -90,6 +90,7 @@
povlibdir = @datadir@/povray-3.5
SUBDIRS = doc include ini scenes scripts src tests
+SUBDIRS_DATA = include ini scenes scripts src tests
docdir = ${datadir}/doc/@PACKAGE@-@VERSION@
doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix
povconfdir = @sysconfdir@
@@ -101,7 +102,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ./src/conf.h
CONFIG_CLEAN_FILES =
-DATA = $(doc_DATA) $(sysconf_DATA)
+DATA = $(doc_DATA) #$(sysconf_DATA)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS aclocal.m4 configure configure.in install-sh missing \
@@ -204,7 +205,26 @@
@SET_MAKE@
-all-recursive install-data-recursive install-exec-recursive \
+install-data-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS_DATA)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+all-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
@@ -353,7 +373,7 @@
install-exec-am: install-sysconfDATA
install-exec: install-exec-recursive
-install-data-am: install-docDATA
+install-data-am: #install-docDATA
install-data: install-data-recursive
install-am: all-am

View file

@ -1,13 +0,0 @@
--- povray.ini.orig Tue Oct 22 09:54:06 2002
+++ povray.ini Mon Nov 18 00:00:35 2002
@@ -55,8 +55,8 @@
;; found in the current directory. New directories are added to the
;; search path, up to a maximum of 25.
-Library_Path=/usr/local/share/povray-3.5
-Library_Path=/usr/local/share/povray-3.5/include
+Library_Path=@PREFIX@/share/povray-3.5
+Library_Path=@PREFIX@/share/povray-3.5/include
;; File output type control.
;; T Uncompressed Targa-24

View file

@ -1,34 +0,0 @@
--- src/Makefile.in.orig Tue Jan 7 10:23:23 2003
+++ src/Makefile.in Sat Apr 12 08:56:01 2003
@@ -92,8 +92,10 @@
DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
LDADD = @X_LIBS@
-CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
-CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+#CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+#CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
LDFLAGS = @X_CFLAGS@
EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -102,7 +104,7 @@
PROGRAMS = $(bin_PROGRAMS)
CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
+LIBS = -L${LOCALBASE}/lib @LIBS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -123,7 +125,8 @@
vlbuffer.o warps.o unix.o povxlib.o
povray_LDADD = $(LDADD)
povray_DEPENDENCIES =
-povray_LDFLAGS =
+povray_LDFLAGS = -L$(libdir)
+INCLUDES = -I$(includedir) $(X_CFLAGS)
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@

View file

@ -1,23 +0,0 @@
--- src/frame.h.orig Tue Jan 7 10:08:30 2003
+++ src/frame.h Sun Dec 28 23:37:04 2003
@@ -44,12 +44,20 @@
class pov_istream_class;
class pov_ostream_class;
+#if defined(__LP64__) || defined(__alpha__)
+typedef unsigned int u_int32 ;
+#else
typedef unsigned long u_int32 ;
+#endif
typedef unsigned short u_int16 ;
typedef unsigned char u_int8 ;
typedef unsigned char byte ;
+#if defined(__LP64__) || defined(__alpha__)
+typedef signed int int32 ;
+#else
typedef signed long int32 ;
+#endif
typedef signed short int16 ;
typedef signed char int8 ;

View file

@ -1,11 +0,0 @@
--- src/optin.cpp.orig Sun Dec 28 23:43:15 2003
+++ src/optin.cpp Sun Dec 28 23:43:52 2003
@@ -364,7 +364,7 @@
static bool matches(char *v1, char *v2);
-POV_ISTREAM *Opts_Locate_File(char *filename, unsigned long stype, char *buffer, int err_flag, POVMSObjectPtr obj);
+POV_ISTREAM *Opts_Locate_File(char *filename, u_int32 stype, char *buffer, int err_flag, POVMSObjectPtr obj);
/*****************************************************************************

View file

@ -1,12 +0,0 @@
--- src/optout.h.orig Thu Aug 8 22:00:48 2002
+++ src/optout.h Wed Aug 14 12:14:50 2002
@@ -46,8 +46,7 @@
#define OFFICIAL_VERSION_NUMBER 350
#define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
-#error You must complete the following DISTRIBUTION_MESSAGE macro
-#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."
+#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). */

View file

@ -9,6 +9,6 @@ process by any means, but it produces very high quality images with realistic
reflections, shading, perspective and other effects.
Legal and License information can be consulted in the following file
/usr/local/share/doc/povray-3.50c/povlegal.doc
/usr/local/share/doc/povray-3.6/povlegal.doc
WWW: http://www.povray.org/

File diff suppressed because it is too large Load diff

View file

@ -6,8 +6,7 @@
#
PORTNAME= povray
PORTVERSION= 3.5
PORTREVISION= 3
PORTVERSION= 3.6.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.gigabell.net/pub/unix/apps/graphics/povray/%SUBDIR%/ \
@ -15,9 +14,7 @@ MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.fh-aachen.de/pub/mirror/ftp.povray.org/povray/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
MASTER_SITE_SUBDIR= Official/Unix
DISTNAME= povuni_s
EXTRACT_SUFX= .tgz
DIST_SUBDIR= povray35
DIST_SUBDIR= povray36
MAINTAINER= maho@FreeBSD.org
COMMENT= Persistence of Vision Ray Tracer
@ -25,7 +22,6 @@ COMMENT= Persistence of Vision Ray Tracer
.if defined(WITH_ICC)
BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
.endif
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg
@ -33,12 +29,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-3.50c
USE_XLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
LATEST_LINK= ${PORTNAME}35
USE_AUTOCONF_VER= 259
LATEST_LINK= ${PORTNAME}36
.if defined(WITH_OPTIMIZED_FLAGS)
CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
@ -57,34 +53,25 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib
.endif
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --x-includes=${X11BASE}/include
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include"
CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \
CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \
--disable-optimiz
MAN1= povray.1
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
BROKEN= "Does not compile on i386"
.endif
post-patch:
@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
#@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
#@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
.if !defined(WITH_OPTIMIZED_FLAGS)
@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
.endif
do-install:
@(cd ${WRKSRC} ; ${GMAKE} install-exec)
@(cd ${WRKSRC} ; ${GMAKE} install-data)
.if !defined(NOPORTDOCS)
@(cd ${WRKSRC} ; ${GMAKE} install-docDATA)
@(cd ${WRKSRC}/doc ; ${GMAKE} install)
.endif
@${RM} -f ${PREFIX}/man/man1/povray.1*
@${INSTALL_MAN} ${WRKSRC}/doc/povray.1 ${PREFIX}/man/man1
@(cd ${WRKSRC} ; ${GMAKE} install)
post-install:
@${SED} -e 's,/usr/local,${PREFIX},g' ${DESCR}

View file

@ -1,2 +1,2 @@
MD5 (povray35/povuni_s.tgz) = bac59e7a86172a5bd0c63af2516e7045
SIZE (povray35/povuni_s.tgz) = 6602380
MD5 (povray36/povray-3.6.1.tar.gz) = 6d0da1ab9f7a6374d67d6554337311ee
SIZE (povray36/povray-3.6.1.tar.gz) = 9032066

View file

@ -1,56 +0,0 @@
--- Makefile.in.orig Tue Oct 22 09:54:06 2002
+++ Makefile.in Sun Nov 17 23:56:45 2002
@@ -90,6 +90,7 @@
povlibdir = @datadir@/povray-3.5
SUBDIRS = doc include ini scenes scripts src tests
+SUBDIRS_DATA = include ini scenes scripts src tests
docdir = ${datadir}/doc/@PACKAGE@-@VERSION@
doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix
povconfdir = @sysconfdir@
@@ -101,7 +102,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ./src/conf.h
CONFIG_CLEAN_FILES =
-DATA = $(doc_DATA) $(sysconf_DATA)
+DATA = $(doc_DATA) #$(sysconf_DATA)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS aclocal.m4 configure configure.in install-sh missing \
@@ -204,7 +205,26 @@
@SET_MAKE@
-all-recursive install-data-recursive install-exec-recursive \
+install-data-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS_DATA)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+all-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
@@ -353,7 +373,7 @@
install-exec-am: install-sysconfDATA
install-exec: install-exec-recursive
-install-data-am: install-docDATA
+install-data-am: #install-docDATA
install-data: install-data-recursive
install-am: all-am

View file

@ -1,13 +0,0 @@
--- povray.ini.orig Tue Oct 22 09:54:06 2002
+++ povray.ini Mon Nov 18 00:00:35 2002
@@ -55,8 +55,8 @@
;; found in the current directory. New directories are added to the
;; search path, up to a maximum of 25.
-Library_Path=/usr/local/share/povray-3.5
-Library_Path=/usr/local/share/povray-3.5/include
+Library_Path=@PREFIX@/share/povray-3.5
+Library_Path=@PREFIX@/share/povray-3.5/include
;; File output type control.
;; T Uncompressed Targa-24

View file

@ -1,34 +0,0 @@
--- src/Makefile.in.orig Tue Jan 7 10:23:23 2003
+++ src/Makefile.in Sat Apr 12 08:56:01 2003
@@ -92,8 +92,10 @@
DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
LDADD = @X_LIBS@
-CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
-CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+#CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+#CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
LDFLAGS = @X_CFLAGS@
EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -102,7 +104,7 @@
PROGRAMS = $(bin_PROGRAMS)
CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
+LIBS = -L${LOCALBASE}/lib @LIBS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -123,7 +125,8 @@
vlbuffer.o warps.o unix.o povxlib.o
povray_LDADD = $(LDADD)
povray_DEPENDENCIES =
-povray_LDFLAGS =
+povray_LDFLAGS = -L$(libdir)
+INCLUDES = -I$(includedir) $(X_CFLAGS)
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@

View file

@ -1,23 +0,0 @@
--- src/frame.h.orig Tue Jan 7 10:08:30 2003
+++ src/frame.h Sun Dec 28 23:37:04 2003
@@ -44,12 +44,20 @@
class pov_istream_class;
class pov_ostream_class;
+#if defined(__LP64__) || defined(__alpha__)
+typedef unsigned int u_int32 ;
+#else
typedef unsigned long u_int32 ;
+#endif
typedef unsigned short u_int16 ;
typedef unsigned char u_int8 ;
typedef unsigned char byte ;
+#if defined(__LP64__) || defined(__alpha__)
+typedef signed int int32 ;
+#else
typedef signed long int32 ;
+#endif
typedef signed short int16 ;
typedef signed char int8 ;

View file

@ -1,11 +0,0 @@
--- src/optin.cpp.orig Sun Dec 28 23:43:15 2003
+++ src/optin.cpp Sun Dec 28 23:43:52 2003
@@ -364,7 +364,7 @@
static bool matches(char *v1, char *v2);
-POV_ISTREAM *Opts_Locate_File(char *filename, unsigned long stype, char *buffer, int err_flag, POVMSObjectPtr obj);
+POV_ISTREAM *Opts_Locate_File(char *filename, u_int32 stype, char *buffer, int err_flag, POVMSObjectPtr obj);
/*****************************************************************************

View file

@ -1,12 +0,0 @@
--- src/optout.h.orig Thu Aug 8 22:00:48 2002
+++ src/optout.h Wed Aug 14 12:14:50 2002
@@ -46,8 +46,7 @@
#define OFFICIAL_VERSION_NUMBER 350
#define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
-#error You must complete the following DISTRIBUTION_MESSAGE macro
-#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."
+#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). */

View file

@ -9,6 +9,6 @@ process by any means, but it produces very high quality images with realistic
reflections, shading, perspective and other effects.
Legal and License information can be consulted in the following file
/usr/local/share/doc/povray-3.50c/povlegal.doc
/usr/local/share/doc/povray-3.6/povlegal.doc
WWW: http://www.povray.org/

File diff suppressed because it is too large Load diff

View file

@ -6,8 +6,7 @@
#
PORTNAME= povray
PORTVERSION= 3.5
PORTREVISION= 3
PORTVERSION= 3.6.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.gigabell.net/pub/unix/apps/graphics/povray/%SUBDIR%/ \
@ -15,9 +14,7 @@ MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
ftp://ftp.fh-aachen.de/pub/mirror/ftp.povray.org/povray/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
MASTER_SITE_SUBDIR= Official/Unix
DISTNAME= povuni_s
EXTRACT_SUFX= .tgz
DIST_SUBDIR= povray35
DIST_SUBDIR= povray36
MAINTAINER= maho@FreeBSD.org
COMMENT= Persistence of Vision Ray Tracer
@ -25,7 +22,6 @@ COMMENT= Persistence of Vision Ray Tracer
.if defined(WITH_ICC)
BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
.endif
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
jpeg:${PORTSDIR}/graphics/jpeg
@ -33,12 +29,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-3.50c
USE_XLIB= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
LATEST_LINK= ${PORTNAME}35
USE_AUTOCONF_VER= 259
LATEST_LINK= ${PORTNAME}36
.if defined(WITH_OPTIMIZED_FLAGS)
CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
@ -57,34 +53,25 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib
.endif
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --x-includes=${X11BASE}/include
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include"
CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \
CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \
--disable-optimiz
MAN1= povray.1
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
BROKEN= "Does not compile on i386"
.endif
post-patch:
@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
#@${REINPLACE_CMD} -e 's+@PREFIX@+${PREFIX}+g;' ${WRKSRC}/povray.ini
#@${REINPLACE_CMD} -e 's+%INSTALLDIR%+${PREFIX}/share/${PORTNAME}-${PORTVERSION}+g;' ${WRKSRC}/povray.conf
.if !defined(WITH_OPTIMIZED_FLAGS)
@${ECHO} "You can optimize by setting WITH_OPTIMIZED_FLAGS=yes."
.endif
do-install:
@(cd ${WRKSRC} ; ${GMAKE} install-exec)
@(cd ${WRKSRC} ; ${GMAKE} install-data)
.if !defined(NOPORTDOCS)
@(cd ${WRKSRC} ; ${GMAKE} install-docDATA)
@(cd ${WRKSRC}/doc ; ${GMAKE} install)
.endif
@${RM} -f ${PREFIX}/man/man1/povray.1*
@${INSTALL_MAN} ${WRKSRC}/doc/povray.1 ${PREFIX}/man/man1
@(cd ${WRKSRC} ; ${GMAKE} install)
post-install:
@${SED} -e 's,/usr/local,${PREFIX},g' ${DESCR}

View file

@ -1,2 +1,2 @@
MD5 (povray35/povuni_s.tgz) = bac59e7a86172a5bd0c63af2516e7045
SIZE (povray35/povuni_s.tgz) = 6602380
MD5 (povray36/povray-3.6.1.tar.gz) = 6d0da1ab9f7a6374d67d6554337311ee
SIZE (povray36/povray-3.6.1.tar.gz) = 9032066

View file

@ -1,56 +0,0 @@
--- Makefile.in.orig Tue Oct 22 09:54:06 2002
+++ Makefile.in Sun Nov 17 23:56:45 2002
@@ -90,6 +90,7 @@
povlibdir = @datadir@/povray-3.5
SUBDIRS = doc include ini scenes scripts src tests
+SUBDIRS_DATA = include ini scenes scripts src tests
docdir = ${datadir}/doc/@PACKAGE@-@VERSION@
doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix
povconfdir = @sysconfdir@
@@ -101,7 +102,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ./src/conf.h
CONFIG_CLEAN_FILES =
-DATA = $(doc_DATA) $(sysconf_DATA)
+DATA = $(doc_DATA) #$(sysconf_DATA)
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS aclocal.m4 configure configure.in install-sh missing \
@@ -204,7 +205,26 @@
@SET_MAKE@
-all-recursive install-data-recursive install-exec-recursive \
+install-data-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS_DATA)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+all-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive info-recursive dvi-recursive:
@set fnord $(MAKEFLAGS); amf=$$2; \
@@ -353,7 +373,7 @@
install-exec-am: install-sysconfDATA
install-exec: install-exec-recursive
-install-data-am: install-docDATA
+install-data-am: #install-docDATA
install-data: install-data-recursive
install-am: all-am

View file

@ -1,13 +0,0 @@
--- povray.ini.orig Tue Oct 22 09:54:06 2002
+++ povray.ini Mon Nov 18 00:00:35 2002
@@ -55,8 +55,8 @@
;; found in the current directory. New directories are added to the
;; search path, up to a maximum of 25.
-Library_Path=/usr/local/share/povray-3.5
-Library_Path=/usr/local/share/povray-3.5/include
+Library_Path=@PREFIX@/share/povray-3.5
+Library_Path=@PREFIX@/share/povray-3.5/include
;; File output type control.
;; T Uncompressed Targa-24

View file

@ -1,34 +0,0 @@
--- src/Makefile.in.orig Tue Jan 7 10:23:23 2003
+++ src/Makefile.in Sat Apr 12 08:56:01 2003
@@ -92,8 +92,10 @@
DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
LDADD = @X_LIBS@
-CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
-CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+#CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+#CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
LDFLAGS = @X_CFLAGS@
EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -102,7 +104,7 @@
PROGRAMS = $(bin_PROGRAMS)
CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
+LIBS = -L${LOCALBASE}/lib @LIBS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -123,7 +125,8 @@
vlbuffer.o warps.o unix.o povxlib.o
povray_LDADD = $(LDADD)
povray_DEPENDENCIES =
-povray_LDFLAGS =
+povray_LDFLAGS = -L$(libdir)
+INCLUDES = -I$(includedir) $(X_CFLAGS)
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@

View file

@ -1,23 +0,0 @@
--- src/frame.h.orig Tue Jan 7 10:08:30 2003
+++ src/frame.h Sun Dec 28 23:37:04 2003
@@ -44,12 +44,20 @@
class pov_istream_class;
class pov_ostream_class;
+#if defined(__LP64__) || defined(__alpha__)
+typedef unsigned int u_int32 ;
+#else
typedef unsigned long u_int32 ;
+#endif
typedef unsigned short u_int16 ;
typedef unsigned char u_int8 ;
typedef unsigned char byte ;
+#if defined(__LP64__) || defined(__alpha__)
+typedef signed int int32 ;
+#else
typedef signed long int32 ;
+#endif
typedef signed short int16 ;
typedef signed char int8 ;

View file

@ -1,11 +0,0 @@
--- src/optin.cpp.orig Sun Dec 28 23:43:15 2003
+++ src/optin.cpp Sun Dec 28 23:43:52 2003
@@ -364,7 +364,7 @@
static bool matches(char *v1, char *v2);
-POV_ISTREAM *Opts_Locate_File(char *filename, unsigned long stype, char *buffer, int err_flag, POVMSObjectPtr obj);
+POV_ISTREAM *Opts_Locate_File(char *filename, u_int32 stype, char *buffer, int err_flag, POVMSObjectPtr obj);
/*****************************************************************************

View file

@ -1,12 +0,0 @@
--- src/optout.h.orig Thu Aug 8 22:00:48 2002
+++ src/optout.h Wed Aug 14 12:14:50 2002
@@ -46,8 +46,7 @@
#define OFFICIAL_VERSION_NUMBER 350
#define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
-#error You must complete the following DISTRIBUTION_MESSAGE macro
-#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."
+#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). */

View file

@ -9,6 +9,6 @@ process by any means, but it produces very high quality images with realistic
reflections, shading, perspective and other effects.
Legal and License information can be consulted in the following file
/usr/local/share/doc/povray-3.50c/povlegal.doc
/usr/local/share/doc/povray-3.6/povlegal.doc
WWW: http://www.povray.org/

File diff suppressed because it is too large Load diff