Index: head/graphics/libpano13/Makefile =================================================================== --- head/graphics/libpano13/Makefile (revision 401909) +++ head/graphics/libpano13/Makefile (revision 401910) @@ -1,48 +1,49 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= libpano13 -PORTVERSION= 2.9.18 -PORTREVISION= 4 +PORTVERSION= 2.9.19 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= vd@FreeBSD.org +MAINTAINER= grog@FreeBSD.org COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng16.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff USE_GNOME= gtk20 glib20 pango atk USES= autoreconf jpeg libtool GNU_CONFIGURE= yes 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 CONFIGURE_ARGS= --with-png=${LOCALBASE} \ --with-jpeg=${LOCALBASE} \ --with-tiff=${LOCALBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= JAVA OPTIONS_SUB= yes .include .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native CONFIGURE_ARGS+= --with-java=${JAVA_HOME} .else CONFIGURE_ARGS+= --without-java .endif .include Index: head/graphics/libpano13/distinfo =================================================================== --- head/graphics/libpano13/distinfo (revision 401909) +++ head/graphics/libpano13/distinfo (revision 401910) @@ -1,2 +1,2 @@ -SHA256 (libpano13-2.9.18.tar.gz) = de5d4e43f15c3430e95c0faa1c50c9503516e1b570d0ec0522f610a578caa172 -SIZE (libpano13-2.9.18.tar.gz) = 2723032 +SHA256 (libpano13-2.9.19.tar.gz) = 037357383978341dea8f572a5d2a0876c5ab0a83dffda431bd393357e91d95a8 +SIZE (libpano13-2.9.19.tar.gz) = 3527845 Index: head/graphics/libpano13/files/patch-Makefile.am =================================================================== --- head/graphics/libpano13/files/patch-Makefile.am (revision 401909) +++ head/graphics/libpano13/files/patch-Makefile.am (revision 401910) @@ -1,38 +1,38 @@ ---- Makefile.am.orig 2010-07-25 00:16:56.000000000 +0300 -+++ Makefile.am 2011-01-21 11:25:52.000000000 +0200 -@@ -91,13 +91,23 @@ +--- Makefile.am.orig 2014-02-18 09:04:42.000000000 +1100 ++++ Makefile.am 2015-10-20 17:28:01.000000000 +1100 +@@ -94,13 +94,23 @@ endif -AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG) +if HAVE_FREEBSD -+FBSD_SRC = sys_ansi.c ppm.c -+FBSD_DEFS = -D__Ansi__=1 -+FBSD_LDFS = -version-info 2:0:0 ++LIN_SRC = sys_ansi.c sys_compat_unix.c ppm.c ++LIN_DEFS = -D__Ansi__=1 ++LIN_LDFS = -version-info 3: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) $(SOL_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) $(SOL_SRC) +libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_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) $(SOL_LDFS) +libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(FBSD_LDFS) libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@ pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR) -@@ -105,7 +115,7 @@ +@@ -108,7 +118,7 @@ noinst_HEADERS = $(INTERNAL_HDR) $(SYS_HDR) $(MAC_HDR) # Pkg-config script. -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(exec_prefix)/libdata/pkgconfig pkgconfig_DATA = libpano13.pc DISTCLEANFILES = $(pkgconfig_DATA) Index: head/graphics/libpano13/pkg-plist =================================================================== --- head/graphics/libpano13/pkg-plist (revision 401909) +++ head/graphics/libpano13/pkg-plist (revision 401910) @@ -1,38 +1,38 @@ %%JAVA%%bin/PTAInterpolate 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.so -lib/libpano13.so.2 -lib/libpano13.so.2.0.0 +lib/libpano13.so.3 +lib/libpano13.so.3.0.0 libdata/pkgconfig/libpano13.pc man/man1/PTAInterpolate.1.gz man/man1/PTblender.1.gz man/man1/PTcrop.1.gz man/man1/PTinfo.1.gz man/man1/PTmasker.1.gz man/man1/PTmender.1.gz man/man1/PToptimizer.1.gz man/man1/PTroller.1.gz man/man1/PTtiff2psd.1.gz man/man1/PTtiffdump.1.gz man/man1/PTuncrop.1.gz man/man1/panoinfo.1.gz