Attachment #78354 for bug #112728

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

Lines 6-12 Link Here

(-)./Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= png	8	PORTNAME= png
9	PORTVERSION= 1.2.14	9	PORTVERSION= 1.2.17
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= lib${PORTNAME}	12	MASTER_SITE_SUBDIR= lib${PORTNAME}

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (libpng-1.2.14.tar.bz2) = 2ec1e1beb2e6376b09d090f74d259160	1	MD5 (libpng-1.2.17.tar.bz2) = 9afd60d96a1720d98194f8f94b2f0477
2	SHA256 (libpng-1.2.14.tar.bz2) = 2678855a235ed02d5b30831a70dff84d5b562c5de388f1323bd680ac5cdd1722	2	SHA256 (libpng-1.2.17.tar.bz2) = 0a0af5e905fc93d27ebef2e6334372a691bd5451a24d2ff39115ca76d58f1317
3	SIZE (libpng-1.2.14.tar.bz2) = 620379	3	SIZE (libpng-1.2.17.tar.bz2) = 623999




--- scripts/makefile.freebsd.orig	Thu Jan  4 22:04:52 2007
+++ scripts/makefile.freebsd	Thu May 17 10:25:29 2007
@@ -12,22 +12,22 @@
 NOOBJ=          YES
 SHLIB_MAJOR=	${SHLIB_VER}
 SHLIB_MINOR=	0
+.if (${OSVERSION} > 600007)
+NO_PROFILE=	YES
+NO_OBJ=		YES
+.else
 NOPROFILE=	YES
-NOOBJ=          YES
+NOOBJ=		YES
+.endif
 
 # where make install puts libpng.a and png.h
-DESTDIR=	${PREFIX}
-LIBDIR=		/lib
+#DESTDIR=	${PREFIX}
+LIBDIR=		$(PREFIX)/lib
 INCS=		png.h pngconf.h
-INCSDIR=	/include/libpng
+INCSDIR=	${PREFIX}/include/libpng

 
-CFLAGS+= -I. -DPNG_USE_PNGGCCRD
-.if (${MACHINE_ARCH} != "i386")
-CFLAGS+= -DPNG_NO_MMX_CODE
-.endif
+#CFLAGS+= -I. -DPNG_USE_PNGGCCRD
+#.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 \
@@ -44,5 +44,23 @@
@@ -44,5 +43,23 @@
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
 	chmod a-w *.[ch35] $(DOCS) scripts/*

Lines 12-18 Link Here

(-)./files/patch-ab (-1 / +1 lines)
12		12
13	Name: libpng	13	Name: libpng
14	Description: Loads and saves PNG files	14	Description: Loads and saves PNG files
15	Version: 1.2.14	15	Version: 1.2.17
16	-Libs: -L${libdir} -lpng12	16	-Libs: -L${libdir} -lpng12
17	+Libs: -L${libdir} -lpng -lz -lm	17	+Libs: -L${libdir} -lpng -lz -lm
18	Cflags: -I${includedir}	18	Cflags: -I${includedir}

Lines 1-9 Link Here

(-)./files/patch-ad (-6 / +6 lines)
1	--- pngconf.h.bak Wed Jun 28 00:22:34 2006	1	--- pngconf.h.orig Mon May 14 23:27:28 2007
2	+++ pngconf.h Thu Jul 27 22:01:04 2006	2	+++ pngconf.h Thu May 17 10:32:24 2007
3	@@ -722,7 +722,7 @@	3	@@ -729,7 +729,7 @@
4		4	* PNG_NO_MMX_CODE disables the use of MMX code without changing the API.
5	/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0	5	* When MMX code is off, then optimized C replacement functions are used.
6	even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */	6	*/
7	-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)	7	-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
8	+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)	8	+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) && defined(__i386__)
9	# ifndef PNG_ASSEMBLER_CODE_SUPPORTED	9	# ifndef PNG_ASSEMBLER_CODE_SUPPORTED




--- pnggccrd.c.orig	Thu May 17 10:38:20 2007
+++ pnggccrd.c	Thu May 17 10:39:10 2007
@@ -359,6 +359,7 @@
    _pctemp = _pctemp;
    _MMXLength = _MMXLength;
 #endif
+#if 0 /* Strange code: all these variables are const's */
    _const4  = _const4;
    _const6  = _const6;
    _mask8_0  = _mask8_0;
@@ -377,6 +378,7 @@
    _mask48_2 = _mask48_2;
    _mask48_1 = _mask48_1;
    _mask48_0 = _mask48_0;
+#endif /* 0 */
 }
 #endif /* PNG_MMX_CODE_SUPPORTED */


Return to bug 112728

Lines 1-22 Link Here

(-)./files/patch-aa (-19 / +13 lines)
1	--- scripts/makefile.freebsd.orig Sat Feb 25 15:37:11 2006	1	--- scripts/makefile.freebsd.orig Thu Jan 4 22:04:52 2007
2	+++ scripts/makefile.freebsd Thu Jul 27 22:03:50 2006	2	+++ scripts/makefile.freebsd Thu May 17 10:25:29 2007
3	@@ -8,27 +8,26 @@	3	@@ -12,22 +12,22 @@
4	LIB= png	4	NOOBJ= YES
5	SHLIB_MAJOR= ${SHLIB_VER}
6	SHLIB_MINOR= 0
7	+.if (${OSVERSION} > 600007)
8	+NO_PROFILE= YES
9	+NO_OBJ= YES
10	+.else
11	NOPROFILE= YES
12	-NOOBJ= YES
13	+NOOBJ= YES
14	+.endif
15		5
16	# where make install puts libpng.a and png.h	6	# where make install puts libpng.a and png.h
17	-DESTDIR= ${PREFIX}	7	-DESTDIR= ${PREFIX}
18	-LIBDIR= /lib	8	-LIBDIR= /lib
19	+LIBDIR= ${PREFIX}/lib	9	+#DESTDIR= ${PREFIX}
		10	+LIBDIR= $(PREFIX)/lib
20	INCS= png.h pngconf.h	11	INCS= png.h pngconf.h
21	-INCSDIR= /include/libpng	12	-INCSDIR= /include/libpng
22	+INCSDIR= ${PREFIX}/include/libpng	13	+INCSDIR= ${PREFIX}/include/libpng
Lines 31-43 Link Here
31		22
32	-CFLAGS+= -I. -DPNG_USE_PNGGCCRD	23	-CFLAGS+= -I. -DPNG_USE_PNGGCCRD
33	-.if (${MACHINE_ARCH} != "i386")	24	-.if (${MACHINE_ARCH} != "i386")
34	-CFLAGS+= -DPNG_NO_ASSEMBLER_CODE	25	-CFLAGS+= -DPNG_NO_MMX_CODE
35	-.endif	26	-.endif
36	-	27	+#CFLAGS+= -I. -DPNG_USE_PNGGCCRD
		28	+#.if (${MACHINE_ARCH} != "i386")
		29	+#CFLAGS+= -DPNG_NO_MMX_CODE
		30	+#.endif
		31
37	SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \	32	SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
38	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \	33	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
39	pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c	34	@@ -44,5 +44,23 @@
40	@@ -44,5 +43,23 @@
41	DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO	35	DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
42	writelock:	36	writelock:
43	chmod a-w .[ch35] $(DOCS) scripts/	37	chmod a-w .[ch35] $(DOCS) scripts/

Line 0 Link Here

(-)./files/patch-ae (+18 lines)
	1	--- pnggccrd.c.orig Thu May 17 10:38:20 2007
	2	+++ pnggccrd.c Thu May 17 10:39:10 2007
	3	@@ -359,6 +359,7 @@
	4	_pctemp = _pctemp;
	5	_MMXLength = _MMXLength;
	6	#endif
	7	+#if 0 /* Strange code: all these variables are const's */
	8	_const4 = _const4;
	9	_const6 = _const6;
	10	_mask8_0 = _mask8_0;
	11	@@ -377,6 +378,7 @@
	12	_mask48_2 = _mask48_2;
	13	_mask48_1 = _mask48_1;
	14	_mask48_0 = _mask48_0;
	15	+#endif /* 0 */
	16	}
	17	#endif /* PNG_MMX_CODE_SUPPORTED */
	18