Date: Fri, 8 Jul 2011 17:53:19 +0200 (CEST) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158736: exp-run for png-1.5.2 Message-ID: <201107081553.p68FrJj6025687@home3.dinoex.sub.de> Resent-Message-ID: <201107081600.p68G02nF077011@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158736 >Category: ports >Synopsis: exp-run for png-1.5.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jul 08 16:00:02 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Dirk Meyer >Release: FreeBSD 8.2-RELEASE >Organization: privat >Environment: >Description: Update to png-1.5.2, exp run needed. Please test the follwoing patch: http://people.freebsd.org/~dinoex/logs/png152-patch1 Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/png/Makefile,v retrieving revision 1.116 diff -u -r1.116 Makefile --- Makefile 8 Jul 2011 13:27:20 -0000 1.116 +++ Makefile 8 Jul 2011 15:49:46 -0000 @@ -6,10 +6,9 @@ # PORTNAME= png -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.5.2 CATEGORIES= graphics -MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}14/${PORTVERSION} +MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -19,25 +18,20 @@ MAKE_JOBS_SAFE= yes USE_XZ= yes +USE_CMAKE= yes USE_LDCONFIG= yes -MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd -ALL_TARGET= all libpng-config test -MAKE_FLAGS= ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f -SHLIB_VER= 6 -MAKE_ENV= SHLIB_VER="${SHLIB_VER}" -PLIST_SUB= SHLIB_VER="${SHLIB_VER}" +CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man MAN3= libpng.3 libpngpf.3 MAN5= png.5 -MANCOMPRESSED= maybe OPTIONS= APNG "Animated PNG support" On .include <bsd.port.pre.mk> .if !defined(WITHOUT_APNG) || make(makesum) || defined(FETCH_ALL) -MASTER_SITES+= SF/lib${PORTNAME}-apng/libpng-master/${PORTVERSION}:apng +MASTER_SITES+= SF/lib${PORTNAME}-apng/libpng-devel/${PORTVERSION}:apng DISTFILES+= ${DISTNAME}-apng.patch.gz:apng EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .endif @@ -52,15 +46,31 @@ ${GZIP_CMD} -d ${WRKSRC}/${DISTNAME}-apng.patch.gz .endif +post-patch: + ${REINPLACE_CMD} \ + -e 's|RELEASE}.0|RELEASE}|' \ + -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \ + ${WRKSRC}/CMakeLists.txt + +post-build: + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \ + if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ + ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ + (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + fi; \ + ${FALSE}; \ + fi) + pre-su-install: @${MKDIR} ${PREFIX}/include/libpng @${MKDIR} ${PREFIX}/libdata/pkgconfig post-install: - ${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/scripts/libpng.pc.in \ - > ${WRKSRC}/scripts/libpng.pc - ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc \ - ${PREFIX}/libdata/pkgconfig/libpng14.pc - ${LN} -sf libpng14.pc ${PREFIX}/libdata/pkgconfig/libpng.pc + ${INSTALL_DATA} ${WRKSRC}/pngpriv.h ${PREFIX}/include/libpng15/ + ${RMDIR} ${PREFIX}/include/libpng + ${RM} ${PREFIX}/libdata/pkgconfig/libpng.pc + ${LN} -sf libpng15.pc ${PREFIX}/libdata/pkgconfig/libpng.pc + ${RM} ${PREFIX}/lib/libpng15.so.15 + ${MV} ${PREFIX}/lib/libpng15.so.15.2 ${PREFIX}/lib/libpng15.so.15 .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/png/distinfo,v retrieving revision 1.59 diff -u -r1.59 distinfo --- distinfo 8 Jul 2011 13:27:20 -0000 1.59 +++ distinfo 8 Jul 2011 15:49:46 -0000 @@ -1,4 +1,4 @@ -SHA256 (libpng-1.4.5.tar.xz) = 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275 -SIZE (libpng-1.4.5.tar.xz) = 545672 -SHA256 (libpng-1.4.5-apng.patch.gz) = 9ef8990ac71e8ba891b5baa396fbc54d2c55896209d8fa871144cc9db0ad9208 -SIZE (libpng-1.4.5-apng.patch.gz) = 10447 +SHA256 (libpng-1.5.2.tar.xz) = f2bb6be8202af630fc7615fe3ff529aeb45be6ceeb3ad459f94edbf4e01d1cae +SIZE (libpng-1.5.2.tar.xz) = 636256 +SHA256 (libpng-1.5.2-apng.patch.gz) = 7396cf3efab8295930df480c24e91eaadc1222afd3f74ba0b83ca57009a84f04 +SIZE (libpng-1.5.2-apng.patch.gz) = 10452 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/png/pkg-plist,v retrieving revision 1.28 diff -u -r1.28 pkg-plist --- pkg-plist 28 Mar 2010 06:37:33 -0000 1.28 +++ pkg-plist 8 Jul 2011 15:49:46 -0000 @@ -1,17 +1,20 @@ -@unexec rm -f %D/bin/libpng14-config bin/libpng-config -@exec ln -sf %f %D/bin/libpng14-config -include/libpng/png.h -@exec ln -sf libpng/%f %D/include/%f -@unexec rm -f %D/include/%f -include/libpng/pngconf.h -@exec ln -sf libpng/%f %D/include/%f -@unexec rm -f %D/include/%f -include/libpng/pngpriv.h +bin/libpng15-config +include/libpng15/png.h +include/libpng15/pngconf.h +include/libpng15/pnglibconf.h +include/libpng15/pngpriv.h +include/png.h +include/pngconf.h +include/pnglibconf.h lib/libpng.a lib/libpng.so -lib/libpng.so.%%SHLIB_VER%% -libdata/pkgconfig/libpng14.pc -@exec ln -sf %f %D/libdata/pkgconfig/libpng.pc -@unexec rm -f %D/libdata/pkgconfig/libpng.pc -@dirrm include/libpng +libdata/pkgconfig/libpng15.pc +libdata/pkgconfig/libpng.pc +lib/libpng/libpng15-release.cmake +lib/libpng/libpng15.cmake +lib/libpng15.a +lib/libpng15.so +lib/libpng15.so.15 +@dirrm lib/libpng +@dirrm include/libpng15 Index: files/patch-libpng.pc.in =================================================================== RCS file: /home/pcvs/ports/graphics/png/files/patch-libpng.pc.in,v retrieving revision 1.7 diff -u -r1.7 patch-libpng.pc.in --- files/patch-libpng.pc.in 23 Dec 2010 05:41:59 -0000 1.7 +++ files/patch-libpng.pc.in 8 Jul 2011 15:49:46 -0000 @@ -1,18 +0,0 @@ ---- scripts/libpng.pc.in.orig 2009-12-03 02:46:02.000000000 +0100 -+++ scripts/libpng.pc.in 2010-01-12 13:49:36.000000000 +0100 -@@ -1,10 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@/libpng14 -+prefix=@PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include - - Name: libpng - Description: Loads and saves PNG files - Version: 1.4.5 --Libs: -L${libdir} -lpng14 -+Libs: -L${libdir} -lpng -lz -lm - Cflags: -I${includedir} Index: files/patch-makefile.freebsd =================================================================== RCS file: /home/pcvs/ports/graphics/png/files/patch-makefile.freebsd,v retrieving revision 1.3 diff -u -r1.3 patch-makefile.freebsd --- files/patch-makefile.freebsd 4 Jan 2011 06:15:59 -0000 1.3 +++ files/patch-makefile.freebsd 8 Jul 2011 15:49:46 -0000 @@ -1,5 +1,5 @@ ---- scripts/makefile.freebsd.orig 2010-01-03 06:05:38.000000000 +0100 -+++ scripts/makefile.freebsd 2010-01-18 13:25:13.000000000 +0100 +--- scripts/makefile.freebsd.orig 2011-01-06 14:02:38.000000000 +0100 ++++ scripts/makefile.freebsd 2011-01-07 11:16:17.000000000 +0100 @@ -11,17 +11,17 @@ LIB= png SHLIB_MAJOR= ${SHLIB_VER} @@ -14,7 +14,7 @@ -LIBDIR= /lib +#DESTDIR= ${PREFIX} +LIBDIR= ${PREFIX}/lib - INCS= png.h pngconf.h pngpriv.h + INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h -INCSDIR= /include/libpng +INCSDIR= ${PREFIX}/include/libpng INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk @@ -22,9 +22,9 @@ -MANDIR= /man/man +MANDIR= ${PREFIX}/man/man SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ - libpng/pngconf.h ${INCSDIR}/../pngconf.h - LDADD+= -lm -lz -@@ -45,4 +45,22 @@ + libpng/pngconf.h ${INCSDIR}/../pngconf.h \ + libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h +@@ -50,4 +50,22 @@ writelock: chmod a-w *.[ch35] $(DOCS) scripts/* @@ -44,6 +44,6 @@ +beforeinstall: libpng-config + ${BSD_INSTALL_SCRIPT} \ + libpng-config ${PREFIX}/bin -+ ln -sf libpng-config ${PREFIX}/bin/libpng14-config ++ ln -sf libpng-config ${PREFIX}/bin/libpng15-config + .include <bsd.lib.mk> >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107081553.p68FrJj6025687>