Date: Mon, 11 Jan 2010 00:27:05 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/142575: [PATCH] graphics/png: update to 1.2.42, take maintainership Message-ID: <20100110162705.22C812AEC51F@sunpoet.net> Resent-Message-ID: <201001101630.o0AGU6fo092823@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142575
>Category: ports
>Synopsis: [PATCH] graphics/png: update to 1.2.42, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 10 16:30:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Tue Dec 8 02:24:20 CST
>Description:
- Update to 1.2.42
- Take maintainership
- Rename patch files (Repocopy is needed to keep history of changes)
Added file(s):
- files/patch-pngconf.h
- files/patch-scripts-libpng-config-body.in
- files/patch-scripts-libpng.pc.in
- files/patch-scripts-makefile.freebsd
Removed file(s):
- files/patch-aa
- files/patch-ab
- files/patch-ac
- files/patch-ad
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- png-1.2.42.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/png/Makefile /usr/ports/sunpoet/png/Makefile
--- /usr/ports/graphics/png/Makefile 2010-01-10 20:56:54.000000000 +0800
+++ /usr/ports/sunpoet/png/Makefile 2010-01-11 00:23:55.000000000 +0800
@@ -6,7 +6,7 @@
#
PORTNAME= png
-PORTVERSION= 1.2.40
+PORTVERSION= 1.2.42
CATEGORIES= graphics
MASTER_SITES= SF/lib${PORTNAME}/00-lib${PORTNAME}-stable/${PORTVERSION}
DISTNAME= lib${PORTNAME}-${PORTVERSION}
@@ -15,7 +15,7 @@
#PATCHFILES=
#PATCH_DIST_STRIP= -p1
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= sunpoet@sunpoet.net
COMMENT= Library for manipulating PNG images
MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd
diff -ruN --exclude=CVS /usr/ports/graphics/png/distinfo /usr/ports/sunpoet/png/distinfo
--- /usr/ports/graphics/png/distinfo 2009-09-16 09:00:32.000000000 +0800
+++ /usr/ports/sunpoet/png/distinfo 2010-01-10 22:59:21.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (libpng-1.2.40.tar.bz2) = 29bbd1c3cbe54b04bfc2bda43067ccb5
-SHA256 (libpng-1.2.40.tar.bz2) = a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
-SIZE (libpng-1.2.40.tar.bz2) = 629950
+MD5 (libpng-1.2.42.tar.bz2) = 9a5cbe9798927fdf528f3186a8840ebe
+SHA256 (libpng-1.2.42.tar.bz2) = a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7
+SIZE (libpng-1.2.42.tar.bz2) = 670811
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-aa /usr/ports/sunpoet/png/files/patch-aa
--- /usr/ports/graphics/png/files/patch-aa 2007-10-13 21:48:44.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-aa 1970-01-01 08:00:00.000000000 +0800
@@ -1,61 +0,0 @@
---- scripts/makefile.freebsd.orig 2007-06-21 02:10:26.000000000 +0400
-+++ scripts/makefile.freebsd 2007-10-13 17:24:24.000000000 +0400
-@@ -8,26 +8,27 @@
- LIB= png
- SHLIB_MAJOR= ${SHLIB_VER}
- SHLIB_MINOR= 0
--NOPROFILE= YES
-+.if (${OSVERSION} > 600007)
-+NO_PROFILE= YES
-+NO_OBJ= YES
-+.else
-+NOPROFILE= YES
- NOOBJ= YES
-+.endif
-
- # where make install puts libpng.a and png.h
--DESTDIR= ${PREFIX}
--LIBDIR= /lib
-+LIBDIR= ${PREFIX}/lib
- INCS= png.h pngconf.h
--INCSDIR= /include/libpng
-+INCSDIR= ${PREFIX}/include/libpng
- INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk
- MAN= libpng.3 libpngpf.3 png.5
--MANDIR= /man/man
-+MANDIR= ${PREFIX}/man/man
- SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
- libpng/pngconf.h ${INCSDIR}/../pngconf.h
- LDADD+= -lm -lz
- DPADD+= ${LIBM} ${LIBZ}
-
- CFLAGS+= -I.
--.if (${MACHINE_ARCH} != "i386")
--CFLAGS+= -DPNG_NO_MMX_CODE
--.endif
-
- SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
- pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-@@ -45,4 +46,22 @@
- writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
-+libpng-config:
-+ ( cat scripts/libpng-config-head.in; \
-+ echo prefix=\"${PREFIX}\"; \
-+ echo libdir=\"${LIBDIR}\"; \
-+ echo ccopts=\"${ccopts}\"; \
-+ echo cppflags=\"${cppflags}\"; \
-+ echo I_opts=\"-I${INCSDIR}\"; \
-+ echo L_opts=\"-L${LIBDIR}\"; \
-+ echo libs=\"-lpng -lz -lm\"; \
-+ echo ldopts=\"${ldopts}\"; \
-+ cat scripts/libpng-config-body.in ) > libpng-config
-+ chmod +x libpng-config
-+
-+beforeinstall: libpng-config
-+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-+ libpng-config ${PREFIX}/bin
-+ ln -sf libpng-config ${PREFIX}/bin/libpng12-config
-+
- .include <bsd.lib.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-ab /usr/ports/sunpoet/png/files/patch-ab
--- /usr/ports/graphics/png/files/patch-ab 2009-09-16 09:00:32.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-ab 1970-01-01 08:00:00.000000000 +0800
@@ -1,18 +0,0 @@
---- scripts/libpng.pc.in.orig Wed Jun 28 00:22:40 2006
-+++ scripts/libpng.pc.in Sun Jul 23 10:56:25 2006
-@@ -1,10 +1,10 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@/libpng12
-+prefix=@PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-
- Name: libpng
- Description: Loads and saves PNG files
- Version: 1.2.40
--Libs: -L${libdir} -lpng12
-+Libs: -L${libdir} -lpng -lz -lm
- Cflags: -I${includedir}
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-ac /usr/ports/sunpoet/png/files/patch-ac
--- /usr/ports/graphics/png/files/patch-ac 2006-07-23 15:05:41.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-ac 1970-01-01 08:00:00.000000000 +0800
@@ -1,16 +0,0 @@
---- scripts/libpng-config-body.in.orig Wed Sep 18 08:05:43 2002
-+++ scripts/libpng-config-body.in Sun Jul 23 10:27:47 2006
-@@ -77,8 +77,12 @@
- echo ${R_opts}
- ;;
-
-+ --ldopts)
-+ echo ${ldopts}
-+ ;;
-+
- --ldflags)
-- echo ${ldflags} ${L_opts} ${R_opts} ${libs}
-+ echo ${ldopts} ${L_opts} ${R_opts} ${libs}
- ;;
-
- --static)
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-ad /usr/ports/sunpoet/png/files/patch-ad
--- /usr/ports/graphics/png/files/patch-ad 2007-10-13 21:48:45.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-ad 1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- pngconf.h.orig 2007-10-04 15:53:09.000000000 +0400
-+++ pngconf.h 2007-10-13 17:31:06.000000000 +0400
-@@ -737,7 +737,7 @@
- # endif
- #endif
-
--#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
-+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
- # ifndef PNG_ASSEMBLER_CODE_SUPPORTED
- # define PNG_ASSEMBLER_CODE_SUPPORTED
- # endif
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-pngconf.h /usr/ports/sunpoet/png/files/patch-pngconf.h
--- /usr/ports/graphics/png/files/patch-pngconf.h 1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-pngconf.h 2010-01-10 23:03:58.000000000 +0800
@@ -0,0 +1,11 @@
+--- pngconf.h.orig 2010-01-03 13:04:19.000000000 +0800
++++ pngconf.h 2010-01-10 23:03:36.000000000 +0800
+@@ -804,7 +804,7 @@
+ # endif
+ #endif
+
+-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
++#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
+ # ifndef PNG_ASSEMBLER_CODE_SUPPORTED
+ # define PNG_ASSEMBLER_CODE_SUPPORTED
+ # endif
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-scripts-libpng-config-body.in /usr/ports/sunpoet/png/files/patch-scripts-libpng-config-body.in
--- /usr/ports/graphics/png/files/patch-scripts-libpng-config-body.in 1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-scripts-libpng-config-body.in 2010-01-10 23:06:05.000000000 +0800
@@ -0,0 +1,16 @@
+--- scripts/libpng-config-body.in.orig 2002-09-18 12:05:43.000000000 +0800
++++ scripts/libpng-config-body.in 2010-01-10 23:05:37.000000000 +0800
+@@ -77,8 +77,12 @@
+ echo ${R_opts}
+ ;;
+
++ --ldopts)
++ echo ${ldopts}
++ ;;
++
+ --ldflags)
+- echo ${ldflags} ${L_opts} ${R_opts} ${libs}
++ echo ${ldopts} ${L_opts} ${R_opts} ${libs}
+ ;;
+
+ --static)
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-scripts-libpng.pc.in /usr/ports/sunpoet/png/files/patch-scripts-libpng.pc.in
--- /usr/ports/graphics/png/files/patch-scripts-libpng.pc.in 1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-scripts-libpng.pc.in 2010-01-10 23:07:39.000000000 +0800
@@ -0,0 +1,18 @@
+--- scripts/libpng.pc.in.orig 2010-01-03 13:04:21.000000000 +0800
++++ scripts/libpng.pc.in 2010-01-10 23:07:15.000000000 +0800
+@@ -1,10 +1,10 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@/libpng12
++prefix=@PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+
+ Name: libpng
+ Description: Loads and saves PNG files
+ Version: 1.2.42
+-Libs: -L${libdir} -lpng12
++Libs: -L${libdir} -lpng -lz -lm
+ Cflags: -I${includedir}
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-scripts-makefile.freebsd /usr/ports/sunpoet/png/files/patch-scripts-makefile.freebsd
--- /usr/ports/graphics/png/files/patch-scripts-makefile.freebsd 1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/png/files/patch-scripts-makefile.freebsd 2010-01-11 00:22:49.000000000 +0800
@@ -0,0 +1,51 @@
+--- scripts/makefile.freebsd.orig 2010-01-03 13:04:21.000000000 +0800
++++ scripts/makefile.freebsd 2010-01-11 00:22:11.000000000 +0800
+@@ -11,17 +11,21 @@
+ LIB= png
+ SHLIB_MAJOR= ${SHLIB_VER}
+ SHLIB_MINOR= 0
++.if (${OSVERSION} > 600007)
++NO_PROFILE= YES
++NO_OBJ= YES
++.else
+ NOPROFILE= YES
+ NOOBJ= YES
++.endif
+
+ # where make install puts libpng.a and png.h
+-DESTDIR= ${PREFIX}
+-LIBDIR= /lib
++LIBDIR= ${PREFIX}/lib
+ INCS= png.h pngconf.h
+-INCSDIR= /include/libpng
++INCSDIR= ${PREFIX}/include/libpng
+ INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk
+ MAN= libpng.3 libpngpf.3 png.5
+-MANDIR= /man/man
++MANDIR= ${PREFIX}/man/man
+ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \
+ libpng/pngconf.h ${INCSDIR}/../pngconf.h
+ LDADD+= -lm -lz
+@@ -48,4 +52,22 @@
+ writelock:
+ chmod a-w *.[ch35] $(DOCS) scripts/*
+
++libpng-config:
++ ( cat scripts/libpng-config-head.in; \
++ echo prefix=\"${PREFIX}\"; \
++ echo libdir=\"${LIBDIR}\"; \
++ echo ccopts=\"${ccopts}\"; \
++ echo cppflags=\"${cppflags}\"; \
++ echo I_opts=\"-I${INCSDIR}\"; \
++ echo L_opts=\"-L${LIBDIR}\"; \
++ echo libs=\"-lpng -lz -lm\"; \
++ echo ldopts=\"${ldopts}\"; \
++ cat scripts/libpng-config-body.in ) > libpng-config
++ chmod +x libpng-config
++
++beforeinstall: libpng-config
++ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
++ libpng-config ${PREFIX}/bin
++ ln -sf libpng-config ${PREFIX}/bin/libpng12-config
++
+ .include <bsd.lib.mk>
--- png-1.2.42.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100110162705.22C812AEC51F>