- Update graphics/libpgf to 7.15.32

- Chase shlib bump

Security:	9a71953a-474a-11e5-adde-14dae9d210b8

7 files changed, 13 insertions, 39 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 79e3c7b6af5f..b75706af0fac 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	digikam
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	graphics kde
 
diff --git a/graphics/libpgf/Makefile b/graphics/libpgf/Makefile
index b7f8285c1198..f1b1a43eb950 100644
--- a/graphics/libpgf/Makefile
+++ b/graphics/libpgf/Makefile
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	libpgf
-PORTVERSION=	6.14.12
+PORTVERSION=	7.15.32
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-latest/ \
 		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+DISTNAME=	libPGF-codec-and-console-src
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Progressive Graphics Format (PGF) library
 
 LICENSE=	LGPL21
 
-USES=		autoreconf dos2unix libtool
+USES=		autoreconf dos2unix libtool zip
 USE_LDCONFIG=	yes
 
 DOS2UNIX_FILES=	configure.ac
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/PGF/Codec
 
 .include <bsd.port.mk>
diff --git a/graphics/libpgf/distinfo b/graphics/libpgf/distinfo
index 81fec7abaf56..95a2ebafc5aa 100644
--- a/graphics/libpgf/distinfo
+++ b/graphics/libpgf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpgf-src-6.14.12.tar.gz) = bda5995d80762966a25fca3f6a9821f4458657aa87d8631c014c166ae09258eb
-SIZE (libpgf-src-6.14.12.tar.gz) = 91154
+SHA256 (libPGF-codec-and-console-src.zip) = f1dd054b09b0f3651209d67529490b4cbc156a985d8b019ff3bfe575260f4221
+SIZE (libPGF-codec-and-console-src.zip) = 1268177
diff --git a/graphics/libpgf/files/patch-Makefile.am b/graphics/libpgf/files/patch-Makefile.am
index 5e99f4b2af02..4f39f63a0888 100644
--- a/graphics/libpgf/files/patch-Makefile.am
+++ b/graphics/libpgf/files/patch-Makefile.am
@@ -1,5 +1,5 @@
---- ./Makefile.am.orig	2012-06-05 08:24:12.000000000 -0400
-+++ ./Makefile.am	2012-06-05 08:26:55.000000000 -0400
+--- Makefile.am.orig	2015-08-06 23:49:54 UTC
++++ Makefile.am
 @@ -1,9 +1,9 @@
  
  SUBDIRS = src include
@@ -13,8 +13,8 @@
  
  PACKAGE		= @PACKAGE@
  VERSION		= @VERSION@
-@@ -20,8 +20,8 @@
- RPMRELEASE=$(PACKAGE_RELEASE)
+@@ -22,8 +22,8 @@ RPMRELEASE=$(PACKAGE_RELEASE)
+ ACLOCAL_AMFLAGS = -I m4
  
  install-data-local:: $(PACKAGE).pc
 -	$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
diff --git a/graphics/libpgf/files/patch-configure.ac b/graphics/libpgf/files/patch-configure.ac
deleted file mode 100644
index 66837379f1a4..000000000000
--- a/graphics/libpgf/files/patch-configure.ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./configure.ac.orig	2014-06-28 10:01:19.000000000 -0400
-+++ ./configure.ac	2014-06-28 10:01:19.000000000 -0400
-@@ -1,4 +1,6 @@
--AC_INIT(src/PGFimage.cpp)
-+AC_INIT(libpgf, 6.14.12)
-+AC_CONFIG_SRCDIR(src/PGFimage.cpp)
-+AM_INIT_AUTOMAKE
- 
- dnl The library interface version
- dnl see documentation for versioning in the libtool manual
-@@ -24,7 +26,6 @@
- 
- AC_SUBST(PACKAGE_RELEASE)
- 
--AM_INIT_AUTOMAKE(libpgf,6.14.12)
- AC_PROG_LIBTOOL
- AC_CONFIG_HEADERS( config.h )
- AC_PROG_CXX
diff --git a/graphics/libpgf/files/patch-src__Makefile.am b/graphics/libpgf/files/patch-src__Makefile.am
deleted file mode 100644
index f1131a0446e7..000000000000
--- a/graphics/libpgf/files/patch-src__Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./src/Makefile.am.orig	2014-06-28 10:04:21.000000000 -0400
-+++ ./src/Makefile.am	2014-06-28 10:04:35.000000000 -0400
-@@ -1,4 +1,4 @@
--INCLUDES	=  -I$(top_srcdir)/include # @PGFCODEC_CFLAGS@
-+AM_CPPFLAGS	=  -I$(top_srcdir)/include # @PGFCODEC_CFLAGS@
- 
- lib_LTLIBRARIES = libpgf.la
- libpgf_la_LDFLAGS = -version-info @INTERFACE_VERSION@
diff --git a/graphics/libpgf/pkg-plist b/graphics/libpgf/pkg-plist
index 8b0dfb1cc30e..a238a8108186 100644
--- a/graphics/libpgf/pkg-plist
+++ b/graphics/libpgf/pkg-plist
@@ -4,6 +4,6 @@ include/libpgf/PGFstream.h
 include/libpgf/PGFtypes.h
 lib/libpgf.a
 lib/libpgf.so
-lib/libpgf.so.6
-lib/libpgf.so.6.0.11
+lib/libpgf.so.7
+lib/libpgf.so.7.0.15
 libdata/pkgconfig/libpgf.pc