Here is an update to libpng 1.5.14. Just some bugs fixed over
the last few releases.
This finally reinstates the inter-library dependencies for the
shared libraries and fixes up the pkg-config and libpng-config
files for shared vs static linking.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/png/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile 11 Mar 2013 11:10:55 -0000 1.89
+++ Makefile 24 Mar 2013 00:28:24 -0000
@@ -2,8 +2,7 @@
COMMENT= library for manipulating PNG images
-VERSION= 1.5.10
-REVISION= 0
+VERSION= 1.5.14
DISTNAME= libpng-${VERSION}
PKGNAME= png-${VERSION}
SHARED_LIBS= png 15.0
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/graphics/png/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo 30 Mar 2012 18:58:03 -0000 1.32
+++ distinfo 24 Mar 2013 00:28:46 -0000
@@ -1,5 +1,2 @@
-MD5 (libpng-1.5.10.tar.gz) = nl2GS86PBnUbvZmWLs9KrQ==
-RMD160 (libpng-1.5.10.tar.gz) = 8tF++heC9bpmfehAhvfWZOUL4tk=
-SHA1 (libpng-1.5.10.tar.gz) = r1P2mQ+TcyfovDNnxIs5aK7eWT8=
-SHA256 (libpng-1.5.10.tar.gz) = iezAAFufodVKNXmhxQjudkrGanRxQeEgzkckJRRlEH8=
-SIZE (libpng-1.5.10.tar.gz) = 1066062
+SHA256 (libpng-1.5.14.tar.gz) = IgB/gPa21q0rXTe8E13OZwGhek1krubUbt04mL+7EBg=
+SIZE (libpng-1.5.14.tar.gz) = 1073008
Index: patches/patch-scripts_libpng-config-body_in
===================================================================
RCS file: patches/patch-scripts_libpng-config-body_in
diff -N patches/patch-scripts_libpng-config-body_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-scripts_libpng-config-body_in 24 Mar 2013 01:01:18 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- scripts/libpng-config-body.in.orig Sat Mar 23 20:59:22 2013
++++ scripts/libpng-config-body.in Sat Mar 23 21:00:37 2013
+@@ -83,6 +83,7 @@ while test $# -gt 0; do
+
+ --static)
+ R_opts=""
++ libs="${libs} ${static_libs}"
+ ;;
+
+ *)
Index: patches/patch-scripts_libpng_pc_in
===================================================================
RCS file: /home/cvs/ports/graphics/png/patches/patch-scripts_libpng_pc_in,v
retrieving revision 1.24
diff -u -p -r1.24 patch-scripts_libpng_pc_in
--- patches/patch-scripts_libpng_pc_in 30 Mar 2012 18:58:03 -0000 1.24
+++ patches/patch-scripts_libpng_pc_in 24 Mar 2013 01:05:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-scripts_libpng_pc_in,v 1.24 2012/03/30 18:58:03 naddy Exp $
---- scripts/libpng.pc.in.orig Thu Mar 29 07:06:56 2012
-+++ scripts/libpng.pc.in Fri Mar 30 20:00:16 2012
-@@ -1,10 +1,10 @@
+--- scripts/libpng.pc.in.orig Wed Jan 23 21:59:05 2013
++++ scripts/libpng.pc.in Sat Mar 23 21:04:52 2013
+@@ -1,10 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -10,7 +10,8 @@ $OpenBSD: patch-scripts_libpng_pc_in,v 1
Name: libpng
Description: Loads and saves PNG files
- Version: 1.5.10
+ Version: 1.5.14
-Libs: -L${libdir} -lpng15
-+Libs: -L${libdir} -lpng -lz -lm
++Libs: -L${libdir} -lpng
++Libs.private: -lz -lm
Cflags: -I${includedir}
Index: patches/patch-scripts_makefile_openbsd
===================================================================
RCS file: /home/cvs/ports/graphics/png/patches/patch-scripts_makefile_openbsd,v
retrieving revision 1.38
diff -u -p -r1.38 patch-scripts_makefile_openbsd
--- patches/patch-scripts_makefile_openbsd 30 Mar 2012 18:58:03 -0000
1.38
+++ patches/patch-scripts_makefile_openbsd 24 Mar 2013 01:07:59 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_makefile_openbsd,v 1.38 2012/03/30 18:58:03 naddy Exp $
---- scripts/makefile.openbsd.orig Thu Mar 29 07:06:56 2012
-+++ scripts/makefile.openbsd Fri Mar 30 20:00:16 2012
+--- scripts/makefile.openbsd.orig Wed Jan 23 21:59:05 2013
++++ scripts/makefile.openbsd Sat Mar 23 21:07:49 2013
@@ -7,8 +7,10 @@
# and license in png.h
@@ -12,8 +12,12 @@ $OpenBSD: patch-scripts_makefile_openbsd
+INCDIR= ${PREFIX}/include/libpng
SHLIB_MAJOR= 15
- SHLIB_MINOR= 1.5.10
-@@ -25,12 +27,30 @@ CPPFLAGS+= -I${.CURDIR}
+ SHLIB_MINOR= 1.5.14
+@@ -22,15 +24,34 @@ HDRS= png.h pngconf.h pnglibconf.h
+
+ CFLAGS+= -W -Wall
+ CPPFLAGS+= -I${.CURDIR}
++LDADD= -lz -lm
NOPROFILE= Yes
@@ -39,15 +43,15 @@ $OpenBSD: patch-scripts_makefile_openbsd
+ echo prefix=\"$(PREFIX)\"; \
+ echo I_opts=\"-I$(INCDIR)\"; \
+ echo L_opts=\"-L$(LIBDIR)\"; \
-+ echo R_opts=\"-Wl,-rpath,$(LIBDIR)\"; \
-+ echo libs=\"-lpng -lz -lm\"; \
++ echo libs=\"-lpng\"; \
++ echo static_libs=\"-lz -lm\"; \
+ cat scripts/libpng-config-body.in ) > libpng-config
+ chmod +x libpng-config
+
# see scripts/pnglibconf.mak for more options
pnglibconf.h: scripts/pnglibconf.h.prebuilt
cp scripts/pnglibconf.h.prebuilt $@
-@@ -41,13 +61,20 @@ pngtest.o: pngtest.c
+@@ -41,13 +62,20 @@ pngtest.o: pngtest.c
pngtest: pngtest.o
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
@@ -73,7 +77,7 @@ $OpenBSD: patch-scripts_makefile_openbsd
fi
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
-@@ -61,22 +88,19 @@ beforeinstall:
+@@ -61,22 +89,18 @@ beforeinstall:
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
fi
@@ -84,7 +88,7 @@ $OpenBSD: patch-scripts_makefile_openbsd
fi
afterinstall:
- @rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
+- @rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
@rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a
- @rm -f ${DESTDIR}${PREFIX}/include/png.h
- @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 26 Dec 2005 22:33:17 -0000 1.15
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.15 2005/12/26 22:33:17 steven Exp $
-@lib lib/libpng.so.${LIBpng_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/png/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 8 Jul 2011 20:34:37 -0000 1.25
+++ pkg/PLIST 26 Feb 2013 02:35:41 -0000
@@ -1,11 +1,11 @@
@comment $OpenBSD: PLIST,v 1.25 2011/07/08 20:34:37 naddy Exp $
-%%SHARED%%
bin/libpng-config
include/libpng/
include/libpng/png.h
include/libpng/pngconf.h
include/libpng/pnglibconf.h
lib/libpng.a
+@lib lib/libpng.so.${LIBpng_VERSION}
lib/pkgconfig/
lib/pkgconfig/libpng.pc
@man man/man3/libpng.3
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
