5 files changed, 32 insertions, 42 deletions

diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index 63bd81295847..fb3cd7ebaedf 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -9,8 +9,7 @@
 # tools.
 
 PORTNAME=	libpano12
-PORTVERSION=	2.8.4
-PORTREVISION=	2
+PORTVERSION=	2.8.6
 CATEGORIES=	graphics java
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	panotools
@@ -51,9 +50,5 @@ CONFIGURE_ARGS+=	--without-java
 
 pre-configure:
 	cd ${WRKSRC} && ./bootstrap
-#\
-#	${SETENV} ${AUTOTOOLS_ENV} \
-#	ACLOCAL="${ACLOCAL} -I ${LOCALBASE}/share/aclocal" \
-#	./bootstrap
 
 .include <bsd.port.mk>
diff --git a/graphics/libpano12/distinfo b/graphics/libpano12/distinfo
index 187e4c3eaee9..162d03b65557 100644
--- a/graphics/libpano12/distinfo
+++ b/graphics/libpano12/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpano12-2.8.4.tar.gz) = 808fd8eda224c9490ef407f4d82cf8d8
-SHA256 (libpano12-2.8.4.tar.gz) = b16e6b0863ad2fbc1f28f7a2072b241eb676213e62b37981674d3a5a837b6967
-SIZE (libpano12-2.8.4.tar.gz) = 1933134
+MD5 (libpano12-2.8.6.tar.gz) = d4eae64c292bff3001ef3eef0fc9cb94
+SHA256 (libpano12-2.8.6.tar.gz) = ea6b6117dc2deee488f5363afd446360819f92ca473948a1ec88e665deb70c9a
+SIZE (libpano12-2.8.6.tar.gz) = 2513899
diff --git a/graphics/libpano12/files/patch-bootstrap b/graphics/libpano12/files/patch-bootstrap
index 88ee4d68f790..36d8cf94cb10 100644
--- a/graphics/libpano12/files/patch-bootstrap
+++ b/graphics/libpano12/files/patch-bootstrap
@@ -1,11 +1,17 @@
---- bootstrap.orig	2005-01-07 01:26:26.000000000 -0800
-+++ bootstrap	2007-09-22 19:46:15.000000000 -0700
-@@ -44,3 +44,3 @@
- 	case $autoconf_version in
--	    2.5*)
-+	    2.[56]*)
- 		have_autoconf=true
-@@ -98,25 +98 @@
+--- bootstrap.orig	2006-09-07 21:19:28.000000000 +0300
++++ bootstrap	2007-10-05 19:29:22.000000000 +0300
+@@ -60,7 +60,7 @@
+ 	automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #	echo automake version: $automake_version
+ 	case $automake_version in
+-	    1.7*|1.8*|1.9*)
++	    1.7*|1.8*|1.9*|1.[1-9][0-9]*)
+ 		have_automake=true
+ 		;;
+ 	esac
+@@ -96,27 +96,3 @@
+ $AUTOMAKE --add-missing --copy || exit $?
+ 
  $AUTOCONF || exit $?
 -
 -cd $ORIGDIR || exit $?
diff --git a/graphics/libpano12/files/patch-tools_Makefile.am b/graphics/libpano12/files/patch-tools_Makefile.am
index d5f1753c091b..3b2fd627497b 100644
--- a/graphics/libpano12/files/patch-tools_Makefile.am
+++ b/graphics/libpano12/files/patch-tools_Makefile.am
@@ -1,35 +1,28 @@
---- tools/Makefile.am.orig	Wed Jan 17 10:49:07 2007
-+++ tools/Makefile.am	Wed Jan 17 10:51:24 2007
-@@ -24,6 +24,14 @@
- LIN_DEFS = 
+--- tools/Makefile.am.orig	2007-07-02 00:16:15.000000000 +0300
++++ tools/Makefile.am	2007-10-08 11:31:50.000000000 +0300
+@@ -20,7 +20,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_SRC = pano12info_unix.c
 +FBSD_DEFS = -D__Ansi__=1
 +else
 +FBSD_SRC =
 +FBSD_DEFS =
 +endif
 +
- if HAVE_DARWIN
- DAR_SRC =  panoinfo_unix.c
- DAR_DEFS = -D__Ansi__=1
-@@ -32,7 +40,7 @@
- DAR_DEFS = 
- endif
- 
--AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(FBSD_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
++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
-@@ -52,7 +60,7 @@
+ bin_PROGRAMS = pano12info PTOptimizer 
+@@ -28,7 +36,7 @@
  PTOptimizer_SOURCES = PTOptimizer.c
  PTOptimizer_LDADD   = -lpano12
  
--panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
-+panoinfo_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(FBSD_SRC) $(DAR_SRC)
- panoinfo_LDADD      = -lpano12
+-pano12info_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC)
++pano12info_SOURCES    = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(FBSD_SRC)
+ pano12info_LDADD      = -lpano12
  
- EXTRA_DIST = makefile.panoinfo.win32 makefile.ptoptimizer.win32 \
+ EXTRA_DIST = makefile.ptoptimizer.win32 PTOptimizer.vcproj \
diff --git a/graphics/libpano12/pkg-plist b/graphics/libpano12/pkg-plist
index 16c01653b96f..0216b5e6df32 100644
--- a/graphics/libpano12/pkg-plist
+++ b/graphics/libpano12/pkg-plist
@@ -1,9 +1,5 @@
 bin/PTOptimizer
-bin/PTblender
-bin/PTmender
-bin/PTtiff2psd
-bin/PTuncrop
-bin/panoinfo
+bin/pano12info
 include/pano12/PTcommon.h
 include/pano12/filter.h
 include/pano12/panorama.h