11 files changed, 294 insertions, 0 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 386093ab6048..1e1bebef1ce1 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -377,6 +377,7 @@
     SUBDIR += libmorph
     SUBDIR += libopenraw
     SUBDIR += libpano12
+    SUBDIR += libpano13
     SUBDIR += libpcd
     SUBDIR += libqglviewer
     SUBDIR += libqrencode
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
new file mode 100644
index 000000000000..e523ce35e7b0
--- /dev/null
+++ b/graphics/libpano13/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for:	libpano13
+# Date created:				8 October 2007
+# Whom:					Vasil Dimov <vd@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libpano13
+PORTVERSION=	2.9.12
+CATEGORIES=	graphics java
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	panotools
+
+MAINTAINER=	vd@FreeBSD.org
+COMMENT=	Cross-platform library behind Panorama Tools and other photo stitchers
+
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		png:${PORTSDIR}/graphics/png \
+		tiff:${PORTSDIR}/graphics/tiff
+
+USE_GNOME=	gtk20 glib20 pango atk
+
+USE_AUTOTOOLS=	autoconf:261:env autoheader:261:env aclocal:110:env \
+		automake:110:env libtool:15:env
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
+			-I${LOCALBASE}/include/glib-2.0 \
+			-I${LOCALBASE}/include/pango-1.0 \
+			-I${LOCALBASE}/include/atk-1.0"
+
+USE_LDCONFIG=	yes
+
+.if !defined(WITHOUT_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
+JAVA_OS=	native
+CONFIGURE_ARGS+=	--with-java=${JAVA_HOME}
+.else
+CONFIGURE_ARGS+=	--without-java
+.endif
+
+pre-configure:
+	cd ${WRKSRC} && ./bootstrap
+
+.include <bsd.port.mk>
diff --git a/graphics/libpano13/distinfo b/graphics/libpano13/distinfo
new file mode 100644
index 000000000000..007aaa89edb3
--- /dev/null
+++ b/graphics/libpano13/distinfo
@@ -0,0 +1,3 @@
+MD5 (libpano13-2.9.12.tar.gz) = 3ca4f7bfe5a7b0acd86901d502dee8ca
+SHA256 (libpano13-2.9.12.tar.gz) = 2ab248c0681d05e9f02ddbe5e89d3fa398fff3b5fd02f01e640c97be02c99f2a
+SIZE (libpano13-2.9.12.tar.gz) = 3617850
diff --git a/graphics/libpano13/files/patch-Makefile.am b/graphics/libpano13/files/patch-Makefile.am
new file mode 100644
index 000000000000..77a32fa8a39c
--- /dev/null
+++ b/graphics/libpano13/files/patch-Makefile.am
@@ -0,0 +1,29 @@
+--- Makefile.am.orig	2006-12-21 12:14:09.000000000 +0200
++++ Makefile.am	2007-10-09 18:12:31.000000000 +0300
+@@ -81,13 +81,23 @@
+ 
+ endif
+ 
+-AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG)
++if HAVE_FREEBSD
++FBSD_SRC =  sys_ansi.c ppm.c
++FBSD_DEFS = -D__Ansi__=1
++FBSD_LDFS = -version-info 0:0:0
++
++install-exec-hook:
++	@true
++
++endif
++
++AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(ENDIAN_FLAG) $(FBSD_DEFS)
+ 
+ lib_LTLIBRARIES = libpano13.la
+ 
+-libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC)
++libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC)
+ libpano13_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
+-libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS)
++libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(FBSD_LDFS)
+ libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
+ 
+ pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)
diff --git a/graphics/libpano13/files/patch-bootstrap b/graphics/libpano13/files/patch-bootstrap
new file mode 100644
index 000000000000..d109130572cf
--- /dev/null
+++ b/graphics/libpano13/files/patch-bootstrap
@@ -0,0 +1,30 @@
+--- bootstrap.orig	2006-09-07 21:19:28.000000000 +0300
++++ bootstrap	2007-10-05 19:29:22.000000000 +0300
+@@ -96,27 +96,3 @@
+ $AUTOMAKE --add-missing --copy || exit $?
+ 
+ $AUTOCONF || exit $?
+-
+-cd $ORIGDIR || exit $?
+-
+-echo
+-echo "I am going to run ./configure with the following arguments:"
+-echo
+-echo "  --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS $@"
+-echo
+-
+-if test -z "$*"; then
+-  echo "If you wish to pass additional arguments, please specify them "
+-  echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS "
+-  echo "environment variable."
+-  echo
+-fi
+-				
+-$srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@"
+-RC=$?
+-if test $RC -ne 0; then
+-  echo
+-  echo "Configure failed or did not finish!"
+-  exit $RC
+-fi
+-	  
diff --git a/graphics/libpano13/files/patch-configure.ac b/graphics/libpano13/files/patch-configure.ac
new file mode 100644
index 000000000000..723bdcd5657a
--- /dev/null
+++ b/graphics/libpano13/files/patch-configure.ac
@@ -0,0 +1,22 @@
+--- configure.ac.orig	Fri Jun 16 13:30:54 2006
++++ configure.ac	Wed Jan 17 10:40:32 2007
+@@ -45,6 +45,11 @@
+ 		;;
+ 	esac
+ 	;;
++  *freebsd*)
++    PANO_WIN32_RESOURCE=
++    HSYS=freebsd
++    HCPU="${target_cpu}"
++    ;;
+   *darwin*)
+     PANO_WIN32_RESOURCE=
+     HSYS=darwin
+@@ -73,6 +78,7 @@
+ 
+ AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
+ AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
++AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
+ AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
+ AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
+ AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")
diff --git a/graphics/libpano13/files/patch-m4_ax_check_graphics.m4 b/graphics/libpano13/files/patch-m4_ax_check_graphics.m4
new file mode 100644
index 000000000000..78414f3a0965
--- /dev/null
+++ b/graphics/libpano13/files/patch-m4_ax_check_graphics.m4
@@ -0,0 +1,74 @@
+--- m4/ax_check_graphics.m4.orig	Wed Jan 17 11:09:58 2007
++++ m4/ax_check_graphics.m4	Wed Jan 17 11:11:53 2007
+@@ -44,7 +44,7 @@
+   ZLIB_OLD_LDFLAGS=$LDFLAGS
+   ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+   if test "x$ZLIB_HOME" != 'x' ; then
+-    if test "x$HCPU" = 'xamd64' ; then
++    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+       LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
+     else
+       LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
+@@ -69,7 +69,7 @@
+         LIB_ZLIB="-lz"
+         ZLIB_FLAGS="-DHasZLIB"
+       else
+-        if test "x$HCPU" = 'xamd64' ; then
++        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+           LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
+         else
+           LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
+@@ -133,7 +133,7 @@
+   PNG_OLD_LDFLAGS=$LDFLAGS
+   PNG_OLD_CPPFLAGS=$CPPFLAGS
+   if test "x$PNG_HOME" != 'x' ; then
+-    if test "x$HCPU" = 'xamd64' ; then
++    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+       LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
+     else
+       LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
+@@ -158,7 +158,7 @@
+         LIB_PNG="-lpng"
+         PNG_FLAGS="-DHasPNG"
+       else
+-        if test "x$HCPU" = 'xamd64' ; then
++        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+           LIB_PNG="-L$PNG_HOME/lib64 -lpng"
+         else
+           LIB_PNG="-L$PNG_HOME/lib -lpng"
+@@ -224,7 +224,7 @@
+   JPEG_OLD_LDFLAGS=$LDFLAGS
+   JPEG_OLD_CPPFLAGS=$CPPFLAGS
+   if test "x$JPEG_HOME" != 'x' ; then
+-    if test "x$HCPU" = 'xamd64' ; then
++    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+       LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
+     else
+       LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
+@@ -274,7 +274,7 @@
+         LIB_JPEG="-ljpeg"
+         JPEG_FLAGS="-DHasJPEG"
+       else
+-        if test "x$HCPU" = 'xamd64' ; then
++        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+           LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
+         else
+           LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
+@@ -339,7 +339,7 @@
+   TIFF_OLD_LDFLAGS=$LDFLAGS
+   TIFF_OLD_CPPFLAGS=$CPPFLAGS
+   if test "x$TIFF_HOME" != 'x' ; then
+-    if test "x$HCPU" = 'xamd64' ; then
++    if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+       LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
+     else
+       LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
+@@ -364,7 +364,7 @@
+         LIB_TIFF="-ltiff"
+         TIFF_FLAGS="-DHasTIFF"
+       else
+-        if test "x$HCPU" = 'xamd64' ; then
++        if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+           LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
+         else
+           LIB_TIFF="-L$TIFF_HOME/lib -ltiff"
diff --git a/graphics/libpano13/files/patch-m4_ax_check_java.m4 b/graphics/libpano13/files/patch-m4_ax_check_java.m4
new file mode 100644
index 000000000000..658cdeb472a2
--- /dev/null
+++ b/graphics/libpano13/files/patch-m4_ax_check_java.m4
@@ -0,0 +1,21 @@
+--- m4/ax_check_java.m4.orig	Wed Jan 17 11:23:05 2007
++++ m4/ax_check_java.m4	Wed Jan 17 11:25:08 2007
+@@ -2,7 +2,7 @@
+ dnl Usage:
+ dnl AX_CHECK_JAVA
+ dnl Test for java, and defines
+-dnl - JAVA_CFLAGS (compiler flags)
++dnl - JAVA_FLAGS (compiler flags)
+ dnl - LIB_JAVA (linker flags, stripping and path)
+ dnl prerequisites:
+ 
+@@ -78,6 +78,9 @@
+   case "${target_os}" in
+     linux*)
+       java_extra_inc=linux
++      ;;
++    *freebsd*)
++      java_extra_inc=freebsd
+       ;;
+     darwin*)
+       java_extra_inc=darwin
diff --git a/graphics/libpano13/files/patch-tools_Makefile.am b/graphics/libpano13/files/patch-tools_Makefile.am
new file mode 100644
index 000000000000..d8d11116cd82
--- /dev/null
+++ b/graphics/libpano13/files/patch-tools_Makefile.am
@@ -0,0 +1,28 @@
+--- tools/Makefile.am.orig	2006-12-16 23:21:03.000000000 +0200
++++ tools/Makefile.am	2007-10-09 18:14:30.000000000 +0300
+@@ -32,7 +32,15 @@
+ DAR_DEFS = 
+ endif
+ 
+-AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
++if HAVE_FREEBSD
++FBSD_SRC = panoinfo_unix.c
++FBSD_DEFS = -D__Ansi__=1
++else
++FBSD_SRC =
++FBSD_DEFS =
++endif
++
++AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
+ AM_LDFLAGS  = -L${top_builddir}
+ 
+ bin_PROGRAMS = panoinfo PToptimizer PTmender PTblender PTtiff2psd PTuncrop PTtiffdump PTroller PTcrop PTmasker PTinfo
+@@ -69,7 +77,7 @@
+ PToptimizer_SOURCES = PToptimizer.c
+ PToptimizer_LDADD   = -l${PANOLIB}
+ 
+-panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
++panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC)
+ panoinfo_LDADD      = -l${PANOLIB}
+ 
+ EXTRA_DIST = makefile.panoinfo.win32 makefile.ptoptimizer.win32 \
diff --git a/graphics/libpano13/pkg-descr b/graphics/libpano13/pkg-descr
new file mode 100644
index 000000000000..bd7419bdac32
--- /dev/null
+++ b/graphics/libpano13/pkg-descr
@@ -0,0 +1,15 @@
+This is the pano13 library, part of the Panorama Tools by Helmut
+Dersch of the University of Applied Sciences Furtwangen.
+
+Also included with the library are:
+
+- PTOptimizer, a command-line tool for optimizing control points.
+- panoinfo, a command-line tool for querying the library version.
+
+The panorama tools are mainly used to build panoramic images from a set of
+overlapping images. The usability extends beyond "just" building panoramas by
+far though. You can, for instance, use them to render an average of multiple
+images to broaden the dynamic range of the images or average out noise. You
+can also build object movies with them, morph between images and much more.
+
+WWW: http://panotools.sourceforge.net/
diff --git a/graphics/libpano13/pkg-plist b/graphics/libpano13/pkg-plist
new file mode 100644
index 000000000000..39950bc30dcd
--- /dev/null
+++ b/graphics/libpano13/pkg-plist
@@ -0,0 +1,25 @@
+bin/PTblender
+bin/PTcrop
+bin/PTinfo
+bin/PTmasker
+bin/PTmender
+bin/PToptimizer
+bin/PTroller
+bin/PTtiff2psd
+bin/PTtiffdump
+bin/PTuncrop
+bin/panoinfo
+include/pano13/PTcommon.h
+include/pano13/file.h
+include/pano13/filter.h
+include/pano13/panorama.h
+include/pano13/panotypes.h
+include/pano13/pt_stdint.h
+include/pano13/pteditor.h
+include/pano13/ptutils.h
+include/pano13/queryfeature.h
+include/pano13/version.h
+lib/libpano13.la
+lib/libpano13.so
+lib/libpano13.so.0
+@dirrm include/pano13