9 files changed, 218 insertions, 121 deletions

diff --git a/graphics/panorama/Makefile b/graphics/panorama/Makefile
index 71f5317ef910..2f5970a8493b 100644
--- a/graphics/panorama/Makefile
+++ b/graphics/panorama/Makefile
@@ -7,48 +7,34 @@
 
 PORTNAME=	panorama
 PORTVERSION=	0.13.2
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://alpha.gnu.org/gnu/
+MASTER_SITES=	ftp://ftp.debian.org/debian/pool/main/p/panorama/
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig                        
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${PORTNAME}_${PORTVERSION}-2.1.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		png:${PORTSDIR}/graphics/png \
+		ungif:${PORTSDIR}/graphics/libungif
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_FREETYPE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	NOPORTDOCS="${NOPORTDOCS}"
+INSTALLS_SHLIB=	yes
+
+CXX+=		${CPPFLAGS} ${LDFLAGS}
 
-WRKBLD=	${WRKDIR}/build
-SHRDIR=	${PREFIX}/share/panorama
-DOCDIR=	${PREFIX}/share/doc/panorama
-
-do-configure:
-	(cd ${WRKSRC}; ./configure --prefix=${WRKBLD})
-
-do-install:
-	(cd ${WRKSRC}; ${GMAKE} install)
-	@echo "-----Installing binaries"
-	${INSTALL_PROGRAM} ${WRKBLD}/bin/render ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
-	@echo "-----Installing documentation (or what little there is of it)"
-	${MKDIR} ${DOCDIR}
-	${INSTALL_MAN} ${WRKBLD}/doc/[A-Z]* ${DOCDIR}/
-	${MKDIR} ${DOCDIR}/developers
-	${INSTALL_MAN} ${WRKBLD}/doc/developers/* ${DOCDIR}/developers/
-	${MKDIR} ${DOCDIR}/users
-	${INSTALL_MAN} ${WRKBLD}/doc/users/* ${DOCDIR}/users/
-.endif
-	@echo "-----Installing includes, libraries, plugins, and exmaples"
-	${MKDIR} ${SHRDIR}
-	(cd ${WRKBLD}; tar cpf - include lib scenes) \
-		| (cd ${SHRDIR}; tar xpf -)
-	@echo "-----Creating configuration files"
-	${MKDIR} ${SHRDIR}/etc
-	${INSTALL_DATA} ${WRKBLD}/etc/pluginrc ${SHRDIR}/etc/pluginrc
-	@echo "echo [config-data] > ${SHRDIR}/etc/config"
-	@echo "PluginConfigFile=${SHRDIR}/etc/pluginrc" > ${SHRDIR}/etc/config
-	@echo "PluginPath=${SHRDIR}/lib/plugins" >> ${SHRDIR}/etc/config
-	@echo "GradientPath=${SHRDIR}/lib/gradients" >> ${SHRDIR}/etc/config
-	@echo "TexturePath=${SHRDIR}/lib/texture" >> ${SHRDIR}/etc/config
-	@echo "IncludePath=${SHRDIR}/include" >> ${SHRDIR}/etc/config
-
-post-install:
-	${LDCONFIG} -m ${SHRDIR}/lib
+CPPFLAGS=	-I${LOCALBASE}/include/freetype1/freetype \
+		-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/panorama/distinfo b/graphics/panorama/distinfo
index d89dd77849e3..ab18bbd87348 100644
--- a/graphics/panorama/distinfo
+++ b/graphics/panorama/distinfo
@@ -1 +1,2 @@
-MD5 (panorama-0.13.2.tar.gz) = d26ff2224a0433786ccbbb86b7f681a0
+MD5 (panorama_0.13.2.orig.tar.gz) = d26ff2224a0433786ccbbb86b7f681a0
+MD5 (panorama_0.13.2-2.1.diff.gz) = 8ba8b4e9c23c325d7111b9235e0461e2
diff --git a/graphics/panorama/files/patch-Makefile.in b/graphics/panorama/files/patch-Makefile.in
new file mode 100644
index 000000000000..2f92b7162422
--- /dev/null
+++ b/graphics/panorama/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun May 30 08:08:09 1999
++++ Makefile.in	Fri Nov 22 07:14:08 2002
+@@ -42,7 +42,7 @@
+ 
+ installdirs:
+ 		@echo Creating directories...
+-		@${SRC_DIR}/mkinstalldirs ${TOP_DIR} ${BIN_DIR} ${LIB_DIR} ${DOC_DIR} \
++		@${SRC_DIR}/mkinstalldirs ${TOP_DIR} ${BIN_DIR} ${LIB_DIR} \
+                 			    ${CONFIG_DIR} ${INCLUDE_DIR} ${PLUGIN_DIR}  \
+                                             ${TEXTURE_DIR} ${SCENE_DIR} ${GRADIENT_DIR}
+ 
diff --git a/graphics/panorama/files/patch-Makefile.vars.in b/graphics/panorama/files/patch-Makefile.vars.in
new file mode 100644
index 000000000000..72f5b5816e6e
--- /dev/null
+++ b/graphics/panorama/files/patch-Makefile.vars.in
@@ -0,0 +1,32 @@
+--- Makefile.vars.in.orig	Thu Nov 21 20:25:39 2002
++++ Makefile.vars.in	Thu Nov 21 20:33:44 2002
+@@ -14,14 +14,15 @@
+ BIN_DIR      = ${DESTDIR}@bindir@
+ LIB_DIR      = ${DESTDIR}@libdir@
+ DATA_DIR     = ${DESTDIR}@datadir@
+-CONFIG_DIR   = ${DESTDIR}@sysconfdir@
++ETC_DIR      = ${DESTDIR}@sysconfdir@
+ 
++CONFIG_DIR   = ${ETC_DIR}/panorama/
+ DOC_DIR      = ${TOPDIR}/share/doc/panorama/
+-PLUGIN_DIR   = ${LIB_DIR}/plugins/
+-TEXTURE_DIR  = ${DATA_DIR}/texture/
+-GRADIENT_DIR = ${DATA_DIR}/gradients/
+-SCENE_DIR    = ${DATA_DIR}/scenes/
+-INCLUDE_DIR  = ${DATA_DIR}/include/
++PLUGIN_DIR   = ${LIB_DIR}/panorama/plugins/
++TEXTURE_DIR  = ${DATA_DIR}/panorama/texture/
++GRADIENT_DIR = ${DATA_DIR}/panorama/gradients/
++SCENE_DIR    = ${DATA_DIR}/panorama/scenes/
++INCLUDE_DIR  = ${DATA_DIR}/panorama/include/
+ 
+ #
+ # Don't change anything below this line.
+@@ -64,5 +65,5 @@
+ PROF = -fomit-frame-pointer
+ endif
+ 
+-CXXFLAGS = ${OPT} ${STAT} ${PROF} -ansi -pedantic -fno-exceptions -fno-rtti \
+-	   -Wall -Wstrict-prototypes ${DEFS} ${INCLUDE}
++CXXFLAGS = @CXXFLAGS@ ${STAT} ${PROF} -ansi -pedantic -fno-exceptions -fno-rtti \
++	   -Wall -Wstrict-prototypes ${DEFS} ${INCLUDE}
diff --git a/graphics/panorama/files/patch-doc::Makefile.in b/graphics/panorama/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..0a2ff77f12a2
--- /dev/null
+++ b/graphics/panorama/files/patch-doc::Makefile.in
@@ -0,0 +1,25 @@
+--- doc/Makefile.in.orig	Sat Jun 12 07:36:26 1999
++++ doc/Makefile.in	Fri Nov 22 07:24:47 2002
+@@ -28,17 +28,20 @@
+                 done
+ 
+ install:        all
++		@@INSTALL_DATA@ ${SRC_DIR}/config ${CONFIG_DIR}
++		@@INSTALL_DATA@ ${SRC_DIR}/pluginrc ${CONFIG_DIR}
++ifndef NOPORTDOCS
++		@${SRC_DIR}/${BUILD_TOP}/mkinstalldirs ${DOC_DIR}
+ 		@set -e; \
+ 		for i in $(FILES); do \
+ 		  @INSTALL_DATA@ ${SRC_DIR}/$$i ${DOC_DIR}; \
+ 		done
+-		@@INSTALL_DATA@ ${SRC_DIR}/config ${CONFIG_DIR}
+-		@@INSTALL_DATA@ ${SRC_DIR}/pluginrc ${CONFIG_DIR}
+ 		@${SRC_DIR}/${BUILD_TOP}/mkinstalldirs ${DOC_DIR}/developers ${DOC_DIR}/users
+ 		@set -e; \
+ 		for i in $(DIRS); do \
+                   $(MAKE) -C $$i install; \
+                 done
++endif
+ 
+ clean:
+ 		@set -e
diff --git a/graphics/panorama/files/patch-doc::config.in b/graphics/panorama/files/patch-doc::config.in
new file mode 100644
index 000000000000..2db7ecb8e61e
--- /dev/null
+++ b/graphics/panorama/files/patch-doc::config.in
@@ -0,0 +1,24 @@
+--- doc/config.in.orig	Fri Nov 22 07:38:50 2002
++++ doc/config.in	Fri Nov 22 07:56:15 2002
+@@ -3,16 +3,16 @@
+ #
+ 
+ # Plugin list
+-PluginConfigFile=@sysconfdir@/pluginrc
++PluginConfigFile=@prefix@/etc/panorama/pluginrc
+ 
+ # Path to the plugins directory
+-PluginPath=@libdir@/plugins
++PluginPath=@prefix@/lib/panorama/plugins
+ 
+ # Path to the gradients directory
+-GradientPath=@datadir@/gradients
++GradientPath=@prefix@/share/panorama/gradients
+ 
+ # Path to the textures directory
+-TexturePath=@datadir@/texture
++TexturePath=@prefix@/share/panorama/texture
+ 
+ # Path to the includes directory
+-IncludePath=@datadir@/include
++IncludePath=@prefix@/share/panorama/include
diff --git a/graphics/panorama/files/patch-programs::render::render.cpp b/graphics/panorama/files/patch-programs::render::render.cpp
new file mode 100644
index 000000000000..43e7b7f7769f
--- /dev/null
+++ b/graphics/panorama/files/patch-programs::render::render.cpp
@@ -0,0 +1,17 @@
+--- programs/render/render.cpp.bak	Thu Nov 21 06:30:00 2002
++++ programs/render/render.cpp	Thu Nov 21 06:52:35 2002
+@@ -169,12 +169,12 @@
+     _tLocalPath = std::string (pcEnv) + "/.panorama/";
+     if ( !FileExists (_tLocalPath + "config") )
+     {
+-      _tLocalPath = "/etc/panorama/";
++      _tLocalPath = _tTopDir + "/etc/panorama/";
+     }
+   }
+   else
+   {
+-    _tLocalPath = "/etc/panorama/";
++    _tLocalPath = _tTopDir + "/etc/panorama/";
+   }
+ 
+   _tLogFileName = _tLocalPath + "panorama.log";
diff --git a/graphics/panorama/pkg-message b/graphics/panorama/pkg-message
deleted file mode 100644
index 15c4a6d10b99..000000000000
--- a/graphics/panorama/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-This package only includes support for .tga output.
-However, the example scenes call for .png output,
-and thus will not render without modification.
diff --git a/graphics/panorama/pkg-plist b/graphics/panorama/pkg-plist
index db13f2a2a15e..8b4a0afe6050 100644
--- a/graphics/panorama/pkg-plist
+++ b/graphics/panorama/pkg-plist
@@ -1,71 +1,75 @@
 bin/render
-share/doc/panorama/AUTHORS
-share/doc/panorama/BUGS
-share/doc/panorama/CREDITS
-share/doc/panorama/EXPERIMENTAL
-share/doc/panorama/FAQ
-share/doc/panorama/INSTALL
-share/doc/panorama/LICENSE
-share/doc/panorama/NEWS
-share/doc/panorama/README
-share/doc/panorama/developers/C++_Coding_Style
-share/doc/panorama/developers/General
-share/doc/panorama/developers/PROJECTS
-share/doc/panorama/developers/README
-share/doc/panorama/developers/WRITING_A_PLUGIN
-share/doc/panorama/users/README
-share/doc/panorama/users/classes.html
-share/doc/panorama/users/language.html
+etc/panorama/config
+etc/panorama/pluginrc
+lib/libhlapi.so
+lib/libhlapi.so.0
+lib/libllapi.so
+lib/libllapi.so.0
+lib/panorama/plugins/atm_const.plg
+lib/panorama/plugins/bezier.plg
+lib/panorama/plugins/bsdf_cook_torrance.plg
+lib/panorama/plugins/bsdf_lambertian.plg
+lib/panorama/plugins/bsdf_phong.plg
+lib/panorama/plugins/bsdf_schlick.plg
+lib/panorama/plugins/bsdf_schlick_double.plg
+lib/panorama/plugins/bsdf_ward.plg
+lib/panorama/plugins/gif_io.plg
+lib/panorama/plugins/if_cartoon.plg
+lib/panorama/plugins/if_convert_to_grey.plg
+lib/panorama/plugins/if_fog.plg
+lib/panorama/plugins/if_lens_flare.plg
+lib/panorama/plugins/if_text.plg
+lib/panorama/plugins/jpeg_io.plg
+lib/panorama/plugins/mat_brick.plg
+lib/panorama/plugins/mat_checker.plg
+lib/panorama/plugins/mat_crackle.plg
+lib/panorama/plugins/mat_leopard.plg
+lib/panorama/plugins/mat_marble.plg
+lib/panorama/plugins/mat_noise.plg
+lib/panorama/plugins/mat_parquet.plg
+lib/panorama/plugins/mat_wood.plg
+lib/panorama/plugins/mat_worley.plg
+lib/panorama/plugins/of_cartoon.plg
+lib/panorama/plugins/of_convert_to_grey.plg
+lib/panorama/plugins/pinhole.plg
+lib/panorama/plugins/png_io.plg
+lib/panorama/plugins/point_light.plg
+lib/panorama/plugins/projector.plg
+lib/panorama/plugins/raytracer.plg
+lib/panorama/plugins/rt_io.plg
+lib/panorama/plugins/tga_io.plg
+lib/panorama/plugins/warn_light.plg
+%%PORTDOCS%%share/doc/panorama/AUTHORS
+%%PORTDOCS%%share/doc/panorama/BUGS
+%%PORTDOCS%%share/doc/panorama/CREDITS
+%%PORTDOCS%%share/doc/panorama/EXPERIMENTAL
+%%PORTDOCS%%share/doc/panorama/FAQ
+%%PORTDOCS%%share/doc/panorama/INSTALL
+%%PORTDOCS%%share/doc/panorama/LICENSE
+%%PORTDOCS%%share/doc/panorama/NEWS
+%%PORTDOCS%%share/doc/panorama/README
+%%PORTDOCS%%share/doc/panorama/config
+%%PORTDOCS%%share/doc/panorama/developers/C++_Coding_Style
+%%PORTDOCS%%share/doc/panorama/developers/General
+%%PORTDOCS%%share/doc/panorama/developers/PROJECTS
+%%PORTDOCS%%share/doc/panorama/developers/README
+%%PORTDOCS%%share/doc/panorama/developers/WRITING_A_PLUGIN
+%%PORTDOCS%%share/doc/panorama/pluginrc
+%%PORTDOCS%%share/doc/panorama/users/README
+%%PORTDOCS%%share/doc/panorama/users/classes.html
+%%PORTDOCS%%share/doc/panorama/users/language.html
+share/panorama/gradients/crackle1
+share/panorama/gradients/lrgold
+share/panorama/gradients/marble1
+share/panorama/gradients/marble2
+share/panorama/gradients/tropical
+share/panorama/gradients/wood1
+share/panorama/gradients/wood2
+share/panorama/gradients/wood3
+share/panorama/gradients/wood4
+share/panorama/gradients/wood5
 share/panorama/include/colors.inc
 share/panorama/include/materials.inc
-share/panorama/lib/libhlapi.so
-share/panorama/lib/libhlapi.so.0
-share/panorama/lib/libllapi.so
-share/panorama/lib/libllapi.so.0
-@exec /sbin/ldconfig -m %D/share/panorama/lib
-@unexec /sbin/ldconfig -R
-share/panorama/lib/gradients/crackle1
-share/panorama/lib/gradients/lrgold
-share/panorama/lib/gradients/marble1
-share/panorama/lib/gradients/marble2
-share/panorama/lib/gradients/tropical
-share/panorama/lib/gradients/wood1
-share/panorama/lib/gradients/wood2
-share/panorama/lib/gradients/wood3
-share/panorama/lib/gradients/wood4
-share/panorama/lib/gradients/wood5
-share/panorama/lib/plugins/atm_const.plg
-share/panorama/lib/plugins/bezier.plg
-share/panorama/lib/plugins/bsdf_cook_torrance.plg
-share/panorama/lib/plugins/bsdf_lambertian.plg
-share/panorama/lib/plugins/bsdf_phong.plg
-share/panorama/lib/plugins/bsdf_schlick.plg
-share/panorama/lib/plugins/bsdf_schlick_double.plg
-share/panorama/lib/plugins/bsdf_ward.plg
-share/panorama/lib/plugins/if_cartoon.plg
-share/panorama/lib/plugins/if_convert_to_grey.plg
-share/panorama/lib/plugins/if_fog.plg
-share/panorama/lib/plugins/if_lens_flare.plg
-share/panorama/lib/plugins/mat_brick.plg
-share/panorama/lib/plugins/mat_checker.plg
-share/panorama/lib/plugins/mat_crackle.plg
-share/panorama/lib/plugins/mat_leopard.plg
-share/panorama/lib/plugins/mat_marble.plg
-share/panorama/lib/plugins/mat_noise.plg
-share/panorama/lib/plugins/mat_parquet.plg
-share/panorama/lib/plugins/mat_wood.plg
-share/panorama/lib/plugins/mat_worley.plg
-share/panorama/lib/plugins/of_cartoon.plg
-share/panorama/lib/plugins/of_convert_to_grey.plg
-share/panorama/lib/plugins/pinhole.plg
-share/panorama/lib/plugins/point_light.plg
-share/panorama/lib/plugins/projector.plg
-share/panorama/lib/plugins/raytracer.plg
-share/panorama/lib/plugins/rt_io.plg
-share/panorama/lib/plugins/tga_io.plg
-share/panorama/lib/plugins/warn_light.plg
-share/panorama/lib/texture/f16.tga
-share/panorama/lib/texture/supernova.tga
 share/panorama/scenes/atmospheric/atmosphere.rt
 share/panorama/scenes/lights/projector.rt
 share/panorama/scenes/lights/warn.rt
@@ -94,21 +98,21 @@ share/panorama/scenes/objects/rectangle.rt
 share/panorama/scenes/objects/teapot.rt
 share/panorama/scenes/objects/torus.rt
 share/panorama/scenes/objects/triangle.rt
-share/panorama/etc/pluginrc
-share/panorama/etc/config
-@dirrm share/doc/panorama/developers
-@dirrm share/doc/panorama/users
-@dirrm share/doc/panorama
-@dirrm share/panorama/lib/gradients
-@dirrm share/panorama/lib/plugins
-@dirrm share/panorama/lib/texture
-@dirrm share/panorama/lib
-@dirrm share/panorama/include
-@dirrm share/panorama/scenes/atmospheric
-@dirrm share/panorama/scenes/lights
-@dirrm share/panorama/scenes/materials
-@dirrm share/panorama/scenes/misc
+share/panorama/texture/f16.tga
+share/panorama/texture/supernova.tga
+@dirrm share/panorama/texture
 @dirrm share/panorama/scenes/objects
+@dirrm share/panorama/scenes/misc
+@dirrm share/panorama/scenes/materials
+@dirrm share/panorama/scenes/lights
+@dirrm share/panorama/scenes/atmospheric
 @dirrm share/panorama/scenes
-@dirrm share/panorama/etc
+@dirrm share/panorama/include
+@dirrm share/panorama/gradients
 @dirrm share/panorama
+%%PORTDOCS%%@dirrm share/doc/panorama/users
+%%PORTDOCS%%@dirrm share/doc/panorama/developers
+%%PORTDOCS%%@dirrm share/doc/panorama
+@dirrm lib/panorama/plugins
+@dirrm lib/panorama
+@dirrm etc/panorama