Install the Helpers tools and a couple of scripts to actually get them

working.
Bump PKGREVISION.

4 files changed, 77 insertions, 5 deletions

diff --git a/graphics/PanoTools/Makefile b/graphics/PanoTools/Makefile
index ccc7a89211c..580548a03f3 100644
--- a/graphics/PanoTools/Makefile
+++ b/graphics/PanoTools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/04/20 05:07:56 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/20 06:58:19 rh Exp $
 #
 
 DISTNAME=		PanoTools
 PKGNAME=		${DISTNAME}-2.6b1
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/PTLinux
 CATEGORIES=		graphics
 MASTER_SITES=		http://www.path.unimelb.edu.au/~dersch/
@@ -24,7 +25,8 @@ PKG_JVM?=		sun-jdk
 PLIST_SUBST+=		JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libpano12.so				\
+	${INSTALL_DATA} ${WRKSRC}/libpano12.so ${EMULDIR}/lib
+	${LN} -s ${EMULDIR}/lib/libpano12.so				\
 		${PKG_JAVA_HOME}/lib/${MACHINE_ARCH}/libpano12.lib.so
 	${INSTALL_DATA_DIR} ${PREFIX}/share/PanoTools
 .for jar in ptcrypt pteditor ptpicker
@@ -43,6 +45,25 @@ do-install:
 		-e 's|@@ptfile@@|${bin}|g'
 	${INSTALL_SCRIPT} ${WRKDIR}/${bin} ${PREFIX}/bin
 .endfor
+	${SED} < ${FILESDIR}/mkpthelpers.sh > ${WRKDIR}/mkpthelpers	\
+		-e 's|@@prefix@@|${PREFIX}|g'				\
+		-e 's|@@javahome@@|${PKG_JAVA_HOME}|g'			\
+		-e 's|@@ptfile@@|${bin}|g'
+	${INSTALL_SCRIPT} ${WRKDIR}/mkpthelpers ${PREFIX}/bin
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/PanoTools
+.for bin in PTAverage PTInterpolate PTMorpher PTOptimizer PTStereo	\
+	PTStitcher PTStripe
+	${INSTALL_SCRIPT} ${WRKSRC}/Helpers/${bin} ${PREFIX}/libexec/PanoTools
+	[ ! -f ${WRKSRC}/Helpers/${bin}.txt ] ||			\
+	${INSTALL_DATA} ${WRKSRC}/Helpers/${bin}.txt			\
+		${PREFIX}/share/doc/PanoTools
+.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/PanoTools/Templates
+.for hlp in 3DMF_HEADER 3DMF_TRIMESH INDEXED_FACE_FMT LP_ivr		\
+	LPjava_html LPjava_ivr VRML_HEADER vrml_wrl
+	${INSTALL_DATA} ${WRKSRC}/Helpers/Templates/${hlp}		\
+		${PREFIX}/share/PanoTools/Templates
+.endfor
 
 .include "../../emulators/suse_linux/Makefile.application"
 
@@ -51,7 +72,15 @@ DEPENDS+=		suse_base>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_base
 DEPENDS+=		suse_libjpeg>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_libjpeg
 DEPENDS+=		suse_libpng>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_libpng
 DEPENDS+=		suse_libtiff>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_libtiff
+
+EMULSUBDIR=		emul/linux
+LDD=			${EMULDIR}/usr/bin/ldd
+.else
+EMULSUBDIR=
 .endif
 
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+PLIST_SUBST+=		EMULSUBDIR="${EMULSUBDIR}"
+
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/PanoTools/PLIST b/graphics/PanoTools/PLIST
index a2a15133d5e..aa4cc9f60fc 100644
--- a/graphics/PanoTools/PLIST
+++ b/graphics/PanoTools/PLIST
@@ -1,17 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/19 07:55:34 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/04/20 06:58:20 rh Exp $
+bin/mkpthelpers
 bin/ptcrypt
 bin/pteditor
 bin/ptpicker
+${EMULSUBDIR}/lib/libpano12.so
+libexec/PanoTools/PTAverage
+libexec/PanoTools/PTInterpolate
+libexec/PanoTools/PTMorpher
+libexec/PanoTools/PTOptimizer
+libexec/PanoTools/PTStereo
+libexec/PanoTools/PTStitcher
+libexec/PanoTools/PTStripe
 ${JAVA_HOME}/lib/${MACHINE_ARCH}/libpano12.lib.so
+share/PanoTools/Templates/3DMF_HEADER
+share/PanoTools/Templates/3DMF_TRIMESH
+share/PanoTools/Templates/INDEXED_FACE_FMT
+share/PanoTools/Templates/LP_ivr
+share/PanoTools/Templates/LPjava_html
+share/PanoTools/Templates/LPjava_ivr
+share/PanoTools/Templates/VRML_HEADER
+share/PanoTools/Templates/vrml_wrl
 share/PanoTools/ptcrypt.jar
 share/PanoTools/pteditor.jar
 share/PanoTools/ptpicker.jar
 share/doc/PanoTools/COPYRIGHT_TIFF
 share/doc/PanoTools/Copying.html
 share/doc/PanoTools/Optimizer_Script.txt
+share/doc/PanoTools/PTAverage.txt
+share/doc/PanoTools/PTStereo.txt
+share/doc/PanoTools/PTStitcher.txt
+share/doc/PanoTools/PTStripe.txt
 share/doc/PanoTools/README_JPEG
 share/doc/PanoTools/Readme.html
 share/doc/PanoTools/Readme.txt
 share/doc/PanoTools/Stitcher_Script.txt
 @dirrm share/doc/PanoTools
+@dirrm share/PanoTools/Templates
 @dirrm share/PanoTools
+@dirrm libexec/PanoTools
diff --git a/graphics/PanoTools/files/mkpthelpers.sh b/graphics/PanoTools/files/mkpthelpers.sh
new file mode 100755
index 00000000000..5688627b315
--- /dev/null
+++ b/graphics/PanoTools/files/mkpthelpers.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+#	$Id: mkpthelpers.sh,v 1.1 2003/04/20 06:58:20 rh Exp $
+#
+# This script creates a Helpers directory in the current directory.
+# It will also create a Script.txt if it doesn't exist yet.
+# Both are needed for the PanoTools helpers to work.
+#
+if mkdir Helpers ; then
+	for i in PTAverage PTInterpolate PTMorpher PTOptimizer PTStereo	\
+	    PTStitcher PTStripe ; do
+		ln -s @@prefix@@/libexec/PanoTools/$i Helpers
+	done
+
+	cp -R @@prefix@@/share/PanoTools/Templates Helpers
+fi
+
+[ -f Script.txt ] ||							\
+cp @@prefix@@/share/doc/PanoTools/Stitcher_Script.txt Script.txt
diff --git a/graphics/PanoTools/files/ptfile.sh b/graphics/PanoTools/files/ptfile.sh
index ed04f962ee2..a3277c96946 100755
--- a/graphics/PanoTools/files/ptfile.sh
+++ b/graphics/PanoTools/files/ptfile.sh
@@ -1,13 +1,14 @@
 #!/bin/sh
 #
-#	$Id: ptfile.sh,v 1.1.1.1 2003/04/19 07:55:34 rh Exp $
+#	$Id: ptfile.sh,v 1.2 2003/04/20 06:58:20 rh Exp $
 #
 export CLASSPATH=@@prefix@@/share/PanoTools:${CLASSPATH}
 export JAVA_HOME=@@javahome@@
 export PATH=$JAVA_HOME/bin:$PATH
+@@prefix@@/bin/mkpthelpers
 ulimit -d `ulimit -d -H`
 ulimit -s `ulimit -s -H`
 ulimit -m `ulimit -m -H`
 ulimit -p `ulimit -p -H`
 ulimit -n `ulimit -n -H`
-java -jar @@prefix@@/share/PanoTools/@@ptfile@@.jar "$@"
+exec java -jar @@prefix@@/share/PanoTools/@@ptfile@@.jar "$@"