aboutsummaryrefslogtreecommitdiff
path: root/graphics/png
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2006-07-27 18:21:10 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2006-07-27 18:21:10 +0000
commitb2f122946bef43497e48251043317ee2addab7a4 (patch)
treea771890b707fa60d8ca2850f4cf2880863733e3b /graphics/png
parent6f66a17fb3525de70eae19870fc14e36ae953111 (diff)
downloadports-b2f122946bef43497e48251043317ee2addab7a4.tar.gz
ports-b2f122946bef43497e48251043317ee2addab7a4.zip
Notes
Diffstat (limited to 'graphics/png')
-rw-r--r--graphics/png/Makefile1
-rw-r--r--graphics/png/files/patch-aa17
-rw-r--r--graphics/png/files/patch-ad11
3 files changed, 19 insertions, 10 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index b31e9a5fca22..01cbcfdfc8d9 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -7,6 +7,7 @@
PORTNAME= png
PORTVERSION= 1.2.12
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lib${PORTNAME}
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index 2bac1cb5f3d2..0005b7d28395 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,6 +1,6 @@
---- scripts/makefile.freebsd.orig Sat May 18 22:46:45 2002
-+++ scripts/makefile.freebsd Thu Apr 27 23:54:36 2006
-@@ -8,26 +8,31 @@
+--- scripts/makefile.freebsd.orig Sat Feb 25 15:37:11 2006
++++ scripts/makefile.freebsd Thu Jul 27 22:03:50 2006
+@@ -8,27 +8,26 @@
LIB= png
SHLIB_MAJOR= ${SHLIB_VER}
SHLIB_MINOR= 0
@@ -32,15 +32,12 @@
-CFLAGS+= -I. -DPNG_USE_PNGGCCRD
-.if (${MACHINE_ARCH} != "i386")
-CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
-+cppflags=-DPNG_USE_PNGGCCRD
-+.if (${ARCH} != "i386")
-+cppflags+=-DPNG_NO_ASSEMBLER_CODE
- .endif
-+CFLAGS+=-I. ${cppflags}
-
+-.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 +49,23 @@
+ pngwtran.c pngmem.c pngerror.c pngpread.c pnggccrd.c
+@@ -44,5 +43,23 @@
DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
writelock:
chmod a-w *.[ch35] $(DOCS) scripts/*
diff --git a/graphics/png/files/patch-ad b/graphics/png/files/patch-ad
new file mode 100644
index 000000000000..4e01c471a28c
--- /dev/null
+++ b/graphics/png/files/patch-ad
@@ -0,0 +1,11 @@
+--- pngconf.h.bak Wed Jun 28 00:22:34 2006
++++ pngconf.h Thu Jul 27 22:01:04 2006
+@@ -722,7 +722,7 @@
+
+ /* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
+ even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
+-#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