diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index fb3cd7ebaedf..c752d8c70c04 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -1,54 +1,50 @@
 # New ports collection makefile for:   panorama-tools
 # Date created:        26 august 2004
 # Whom:                cartola (Carlos E. G. Carvalho)
 #
 # $FreeBSD$
 # This port has been made as a building and running dependence for the
 # hugin port.
 # The hugin port is a gui interface to interact with this and other
 # tools.
 
 PORTNAME=	libpano12
 PORTVERSION=	2.8.6
+PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	panotools
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Panorama Tools to make panorama pictures
 
-BUILD_DEPENDS=	gimp>0:${PORTSDIR}/graphics/gimp
-RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		png:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		cairo:${PORTSDIR}/graphics/cairo
+		jpeg:${PORTSDIR}/graphics/jpeg
 
 USE_GNOME=	gtk20 glib20 pango atk
 
 USE_AUTOTOOLS=	autoconf:261:env autoheader:261:env aclocal:19:env \
 		automake:19: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/gimp-2.0 \
 			-I${LOCALBASE}/include/glib-2.0 \
-			-I${LOCALBASE}/include/cairo \
 			-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/libpano12/files/patch-tools_Makefile.am b/graphics/libpano12/files/patch-tools_Makefile.am
index 3b2fd627497b..3e0ab5a65d5c 100644
--- a/graphics/libpano12/files/patch-tools_Makefile.am
+++ b/graphics/libpano12/files/patch-tools_Makefile.am
@@ -1,28 +1,31 @@
 --- 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 @@
++++ tools/Makefile.am	2007-10-09 19:10:41.000000000 +0300
+@@ -20,15 +20,23 @@
  DAR_DEFS = 
  endif
  
 -AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
 +if HAVE_FREEBSD
 +FBSD_SRC = pano12info_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 = pano12info PTOptimizer 
-@@ -28,7 +36,7 @@
- PTOptimizer_SOURCES = PTOptimizer.c
- PTOptimizer_LDADD   = -lpano12
+-bin_PROGRAMS = pano12info PTOptimizer 
++bin_PROGRAMS = pano12info PTOptimizer12
+ 
+-PTOptimizer_SOURCES = PTOptimizer.c
+-PTOptimizer_LDADD   = -lpano12
++PTOptimizer12_SOURCES = PTOptimizer.c
++PTOptimizer12_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.ptoptimizer.win32 PTOptimizer.vcproj \
diff --git a/graphics/libpano12/pkg-plist b/graphics/libpano12/pkg-plist
index 0216b5e6df32..b22e25025107 100644
--- a/graphics/libpano12/pkg-plist
+++ b/graphics/libpano12/pkg-plist
@@ -1,15 +1,15 @@
-bin/PTOptimizer
+bin/PTOptimizer12
 bin/pano12info
 include/pano12/PTcommon.h
 include/pano12/filter.h
 include/pano12/panorama.h
 include/pano12/panotypes.h
 include/pano12/pt_stdint.h
 include/pano12/pteditor.h
 include/pano12/ptutils.h
 include/pano12/queryfeature.h
 include/pano12/version.h
 lib/libpano12.la
 lib/libpano12.so
 lib/libpano12.so.0
 @dirrm include/pano12