Attachment #85209 for bug #121328

View | Details | Raw Unified | Return to bug 121328
Collapse All | Expand All




#

PORTNAME=	png
PORTVERSION=	1.2.25
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	lib${PORTNAME}
DISTNAME=	lib${PORTNAME}-${PORTVERSION}

PATCH_SITES=	${MASTER_SITES}
#PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
#PATCHFILES=
#PATCH_DIST_STRIP= -p1

MAINTAINER=	ache@FreeBSD.org
COMMENT=	Library for manipulating PNG images

MAKEFILE=	${WRKSRC}/scripts/makefile.freebsd
ALL_TARGET=	all libpng-config test
MAKE_FLAGS=	ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f
USE_LDCONFIG=	yes
SHLIB_VER=	5
USE_BZIP2=	yes


Lines 1-3 Link Here

(-)png/distinfo (-3 / +3 lines)
1	MD5 (libpng-1.2.23.tar.bz2) = b1b3794a8b80dd298d4d216f4886ad52	1	MD5 (libpng-1.2.25.tar.bz2) = 0c1df914de7fd3b6a129af569889c856
2	SHA256 (libpng-1.2.23.tar.bz2) = 87da54b8b03156d0ff6d4904e01f2afaf12c712f628f43c5f499704379c2b478	2	SHA256 (libpng-1.2.25.tar.bz2) = 2e92eada0c32d5e49da5617d389e43bc27a18bdca4b8d7badb7fee931d157ce0
3	SIZE (libpng-1.2.23.tar.bz2) = 614843	3	SIZE (libpng-1.2.25.tar.bz2) = 638262




--- 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.23
-Libs: -L${libdir} -lpng12
+Libs: -L${libdir} -lpng -lz -lm
 Cflags: -I${includedir}

Lines 1-11 Link Here

(-)png/files/patch-ad (-11 lines)
1	--- pngconf.h.orig 2007-10-04 15:53:09.000000000 +0400
2	+++ pngconf.h 2007-10-13 17:31:06.000000000 +0400
3	@@ -737,7 +737,7 @@
4	# endif
5	#endif
6
7	-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
8	+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
9	# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
10	# define PNG_ASSEMBLER_CODE_SUPPORTED
11	# endif

Line 0 Link Here

(-)png/files/patch-pngconf.h (+11 lines)
	1	--- pngconf.h.orig 2008-03-03 12:26:00.438934464 -0500
	2	+++ pngconf.h 2008-03-03 12:27:33.024234271 -0500
	3	@@ -742,7 +742,7 @@
	4	# endif
	5	#endif
	6
	7	-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
	8	+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
	9	# ifndef PNG_ASSEMBLER_CODE_SUPPORTED
	10	# define PNG_ASSEMBLER_CODE_SUPPORTED
	11	# endif




--- scripts/libpng.pc.in.orig	2008-03-03 13:40:05.365510327 -0500
+++ scripts/libpng.pc.in	2008-03-03 13:45:11.163017831 -0500
@@ -1,10 +1,10 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/libpng12
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
 
 Name: libpng
 Description: Loads and saves PNG files
 Version: 1.2.25
-Libs: -L${libdir} -lpng12
+Libs: -L${libdir} -lpng -lz -lm
 Cflags: -I${includedir}

Return to bug 121328

Lines 6-30 Link Here

(-)png/Makefile (-8 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= png	8	PORTNAME= png
9	PORTVERSION= 1.2.23	9	PORTVERSION= 1.2.25
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= lib${PORTNAME}	12	MASTER_SITE_SUBDIR= lib${PORTNAME}
14	DISTNAME= lib${PORTNAME}-${PORTVERSION}	13	DISTNAME= lib${PORTNAME}-${PORTVERSION}
15		14
16	PATCH_SITES= ${MASTER_SITES}
17	#PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
18	#PATCHFILES=
19	#PATCH_DIST_STRIP= -p1
20
21	MAINTAINER= ache@FreeBSD.org	15	MAINTAINER= ache@FreeBSD.org
22	COMMENT= Library for manipulating PNG images	16	COMMENT= Library for manipulating PNG images
23		17
24	MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd	18	MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd
25	ALL_TARGET= all libpng-config test	19	ALL_TARGET= all libpng-config test
26	MAKE_FLAGS= ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f	20	MAKE_FLAGS= ccopts="${CFLAGS}" ldopts="${LDFLAGS}" -f
27	INSTALLS_SHLIB= yes	21	USE_LDCONFIG= yes
28	SHLIB_VER= 5	22	SHLIB_VER= 5
29	USE_BZIP2= yes	23	USE_BZIP2= yes
30		24

Lines 1-18 Link Here

(-)png/files/patch-ab (-18 lines)
1	--- scripts/libpng.pc.in.orig Wed Jun 28 00:22:40 2006
2	+++ scripts/libpng.pc.in Sun Jul 23 10:56:25 2006
3	@@ -1,10 +1,10 @@
4	-prefix=@prefix@
5	-exec_prefix=@exec_prefix@
6	-libdir=@libdir@
7	-includedir=@includedir@/libpng12
8	+prefix=@PREFIX@
9	+exec_prefix=${prefix}
10	+libdir=${exec_prefix}/lib
11	+includedir=${prefix}/include
12
13	Name: libpng
14	Description: Loads and saves PNG files
15	Version: 1.2.23
16	-Libs: -L${libdir} -lpng12
17	+Libs: -L${libdir} -lpng -lz -lm
18	Cflags: -I${includedir}

Line 0 Link Here

(-)png/files/patch-scripts+libpng.pc.in (+18 lines)
	1	--- scripts/libpng.pc.in.orig 2008-03-03 13:40:05.365510327 -0500
	2	+++ scripts/libpng.pc.in 2008-03-03 13:45:11.163017831 -0500
	3	@@ -1,10 +1,10 @@
	4	-prefix=@prefix@
	5	-exec_prefix=@exec_prefix@
	6	-libdir=@libdir@
	7	-includedir=@includedir@/libpng12
	8	+prefix=@PREFIX@
	9	+exec_prefix=${prefix}
	10	+libdir=${prefix}/lib
	11	+includedir=${prefix}/include
	12
	13	Name: libpng
	14	Description: Loads and saves PNG files
	15	Version: 1.2.25
	16	-Libs: -L${libdir} -lpng12
	17	+Libs: -L${libdir} -lpng -lz -lm
	18	Cflags: -I${includedir}