Remove png12, no packages need it.

11 files changed, 1 insertions, 203 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 973868be104..ef965ebf47f 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.610 2011/08/07 15:50:22 obache Exp $
+# $NetBSD: Makefile,v 1.611 2011/08/19 06:11:02 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -334,7 +334,6 @@ SUBDIR+=	ploticus-examples
 SUBDIR+=	plotmtv
 SUBDIR+=	plotutils
 SUBDIR+=	png
-SUBDIR+=	png12
 SUBDIR+=	png2html
 SUBDIR+=	pngcheck
 SUBDIR+=	pngcrush
diff --git a/graphics/png12/DESCR b/graphics/png12/DESCR
deleted file mode 100644
index 892185cf4c3..00000000000
--- a/graphics/png12/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Libpng was written as a companion to the PNG specification, as a
-way to reduce the amount of time and effort it takes to support
-the PNG file format in application programs.  Most users will not
-have to modify the library significantly; advanced users may want
-to modify it more.  The library was coded for both users.  All
-attempts were made to make it as complete as possible, while
-keeping the code easy to understand.  Currently, this library
-only supports C.  Support for other languages is being considered.
diff --git a/graphics/png12/Makefile b/graphics/png12/Makefile
deleted file mode 100644
index 991c6286969..00000000000
--- a/graphics/png12/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
-DISTNAME=	libpng-1.2.46
-PKGNAME=	png12-1.2.46
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
-		ftp://ftp.fu-berlin.de/unix/graphics/png/src/
-EXTRACT_SUFX=	.tar.gz
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.libpng.org/pub/png/libpng.html
-COMMENT=	Library for manipulating PNG images
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=	yes
-PKGCONFIG_OVERRIDE=	scripts/libpng.pc.in
-TEST_TARGET=	check
-USE_LIBTOOL=	yes
-
-CONFIGURE_ARGS+= --without-libpng-compat
-
-.include "../../mk/bsd.prefs.mk"
-# keep this in sync with the same code in buildlink3.mk
-.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
-CPPFLAGS+=	-DPNG_NO_ASSEMBLER_CODE
-.endif
-
-SUBST_CLASSES+=		rpathfix
-SUBST_FILES.rpathfix=	scripts/libpng-config.in scripts/libpng.pc-configure.in
-SUBST_MESSAGE.rpathfix=	Adding rpath to libpng-config and libpng.pc
-SUBST_SED.rpathfix=	-e 's/-L$${libdir}/${COMPILER_RPATH_FLAG}$${libdir} -L$${libdir}/g'
-SUBST_STAGE.rpathfix=	pre-configure
-
-post-extract:
-	mv ${WRKSRC}/libpng.3 ${WRKSRC}/libpng12.3
-	mv ${WRKSRC}/libpngpf.3 ${WRKSRC}/libpngpf12.3
-	mv ${WRKSRC}/png.5 ${WRKSRC}/png12.5
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png12/PLIST b/graphics/png12/PLIST
deleted file mode 100644
index 4a5bec13038..00000000000
--- a/graphics/png12/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-bin/libpng12-config
-include/libpng12/png.h
-include/libpng12/pngconf.h
-lib/libpng12.la
-lib/pkgconfig/libpng12.pc
-man/man3/libpng12.3
-man/man3/libpngpf12.3
-man/man5/png12.5
diff --git a/graphics/png12/buildlink3.mk b/graphics/png12/buildlink3.mk
deleted file mode 100644
index 76453bb6b68..00000000000
--- a/graphics/png12/buildlink3.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
-BUILDLINK_TREE+=	png12
-
-.if !defined(PNG_BUILDLINK3_MK)
-PNG_BUILDLINK3_MK:=
-
-# XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped:
-.  include "../../mk/bsd.fast.prefs.mk"
-.  if ${OPSYS} == "Interix"
-BUILDLINK_ABI_DEPENDS.png12+=	png12>=1.2.14nb1 # fixes linkage bug
-.  endif
-
-BUILDLINK_API_DEPENDS.png12+=	png12>=1.2.4
-BUILDLINK_ABI_DEPENDS.png12+=	png12>=1.2.9nb2
-BUILDLINK_PKGSRCDIR.png12?=	../../graphics/png12
-
-# keep this in sync with the same code in Makefile
-.  if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
-CPPFLAGS+=	-DPNG_NO_ASSEMBLER_CODE
-.  endif
-
-# Work around broken libtool archive "/usr/X11/lib/libpng12.la" under
-# Mac OS 10.5.4 or newer which references a non-existing version of the
-# PNG shared library.
-.if !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
-BUILDLINK_TRANSFORM+=	rename:-lpng12.0.26.0:-lpng12
-.endif
-
-.include "../../devel/zlib/buildlink3.mk"
-.endif # PNG_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-png12
diff --git a/graphics/png12/distinfo b/graphics/png12/distinfo
deleted file mode 100644
index b84d4862dbb..00000000000
--- a/graphics/png12/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
-SHA1 (libpng-1.2.46.tar.gz) = d5f3a2439b0b6d85a26499b2be09918eb54ea13a
-RMD160 (libpng-1.2.46.tar.gz) = f4f143b1c64d1e2eb3cb662513b311a0568bb04c
-Size (libpng-1.2.46.tar.gz) = 831390 bytes
-SHA1 (patch-aa) = b0352db26cad568285c1cde5a8b7eea582f3983a
-SHA1 (patch-ac) = 4086b56b7a45869677370c395128d3ff41b375af
-SHA1 (patch-ae) = 3ffe2dd12e9018681be7d8c22a89bb45f44a2164
-SHA1 (patch-af) = a0568d53a853cb7defb4ddbc554df48bc23a1b65
diff --git a/graphics/png12/hacks.mk b/graphics/png12/hacks.mk
deleted file mode 100644
index 95649756aea..00000000000
--- a/graphics/png12/hacks.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
-.if !defined(PNG_HACKS_MK)
-PNG_HACKS_MK=	defined
-
-# A workaround for libpng bug #1777158.
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386)
-PKG_HACKS+=	darwin-read_only_relocs
-LDFLAGS+=	-Wl,-read_only_relocs -Wl,suppress
-.endif
-
-.endif		# PNG_HACKS_MK
diff --git a/graphics/png12/patches/patch-aa b/graphics/png12/patches/patch-aa
deleted file mode 100644
index 363bfd4fdba..00000000000
--- a/graphics/png12/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
---- Makefile.in.orig	2010-06-26 00:31:30.000000000 +0000
-+++ Makefile.in
-@@ -303,7 +303,7 @@ TESTS = test-pngtest.sh
- TESTS_ENVIRONMENT = srcdir=$(srcdir)
- 
- # man pages
--dist_man_MANS = libpng.3 libpngpf.3 png.5
-+dist_man_MANS = libpng12.3 libpngpf12.3 png12.5
- EXTRA_SCRIPTS = libpng-config libpng12-config
- bin_SCRIPTS = @binconfigs@
- 
-@@ -1370,25 +1370,20 @@ libpng.vers: libpng.sym
- 
- test: check
- 
--# install the .../include headers as links to the new ones
-+# don't install the .../include headers as links to the new ones
- install-data-hook:
- 	cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
--	cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
--	cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h pngconf.h
- 	cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
--	cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
- 
- # do evil things to libpng to cause libpng12 to be used
- install-exec-hook:
--	cd $(DESTDIR)$(bindir); rm -f libpng-config
--	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
-+	cd $(DESTDIR)$(bindir); rm -f libpng12-config
-+	cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng12-config
- 	@set -x;\
- 	cd $(DESTDIR)$(libdir);\
-+	mv libpng.la libpngcompat.la;\
- 	for ext in a la so sl dylib; do\
- 		rm -f libpng.$$ext;\
--                if test -f $(PNGLIB_BASENAME).$$ext; then\
--                       $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
--                fi;\
- 	done
- 
- uninstall-hook:
diff --git a/graphics/png12/patches/patch-ac b/graphics/png12/patches/patch-ac
deleted file mode 100644
index d3e6ffcabba..00000000000
--- a/graphics/png12/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
---- configure.orig	2010-06-26 00:31:29.000000000 +0000
-+++ configure
-@@ -11456,7 +11456,7 @@ LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5
- $as_echo_n "checking if libraries can be versioned... " >&6; }
- GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
--if test "$GLD"; then
-+if test "$GLD" && test "`uname -s`" != "Interix"; then
-     have_ld_version_script=yes
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
diff --git a/graphics/png12/patches/patch-ae b/graphics/png12/patches/patch-ae
deleted file mode 100644
index ab4c1b9d8a6..00000000000
--- a/graphics/png12/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
---- pngconf.h.orig	2010-06-26 00:31:14.000000000 +0000
-+++ pngconf.h
-@@ -368,8 +368,8 @@
-        /* If you encounter a compiler error here, see the explanation
-         * near the end of INSTALL.
-         */
--           __pngconf.h__ in libpng already includes setjmp.h;
--           __dont__ include it again.;
-+#warning           __pngconf.h__ in libpng already includes setjmp.h;
-+#warning           __dont__ include it again.;
- #      endif
- #    endif /* __linux__ */
- #  endif /* PNG_SKIP_SETJMP_CHECK */
diff --git a/graphics/png12/patches/patch-af b/graphics/png12/patches/patch-af
deleted file mode 100644
index 7b1d9ce53fb..00000000000
--- a/graphics/png12/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2011/07/31 17:48:16 jakllsch Exp $
-
---- scripts/libpng-config.in.orig	2010-06-26 00:31:16.000000000 +0000
-+++ scripts/libpng-config.in
-@@ -16,10 +16,10 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- libdir="@libdir@"
- includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
--libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-+libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
- all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
- I_opts="-I${includedir}"
--L_opts="-L${libdir}"
-+L_opts="-Wl,-R${libdir} -Wl,-R${libdir} -L${libdir}"
- R_opts=""
- cppflags=""
- ccopts="@LIBPNG_NO_MMX@"