upgrade to libmng 1.0.9

graphics/libmng/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2003/12/23 23:50:56 brad Exp $
+# $OpenBSD: Makefile,v 1.11 2005/07/31 23:19:17 brad Exp $
 
 COMMENT=	"Multiple-image Network Graphics (MNG) reference library"
 
-DISTNAME=	libmng-1.0.5
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	libmng-1.0.9
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libmng/}
 
@@ -20,15 +19,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-SEPARATE_BUILD=	simple
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+FAKE_FLAGS=	DESTDIR="${WRKINST}" PREFIX="${PREFIX}"
 
-post-install:
-	cd ${WRKSRC}/doc/man && \
-		${INSTALL_MAN} libmng.3 ${PREFIX}/man/man3 && \
-		${INSTALL_MAN} mng.5 jng.5 ${PREFIX}/man/man5
+MAKE_ENV=	CC="${CC}"
+MAKE_FILE=	makefiles/makefile.openbsd
+
+NO_REGRESS=	Yes
+
+post-extract:
+	@cp -f ${FILESDIR}/makefile.openbsd ${WRKSRC}/makefiles
 
 .include <bsd.port.mk>

graphics/libmng/distinfo

@@ -1,4 +1,4 @@
-MD5 (libmng-1.0.5.tar.gz) = e4f8f11231f01aa540a9b99251ab8bb6
-RMD160 (libmng-1.0.5.tar.gz) = 751aad4d6be103eb417a2e2adb145ec62b6a66f7
-SHA1 (libmng-1.0.5.tar.gz) = 236c92061c629adacf0ded8c98781333081f584c
-SIZE (libmng-1.0.5.tar.gz) = 623279
+MD5 (libmng-1.0.9.tar.gz) = ff1205ef70855a75c098ea09690413c6
+RMD160 (libmng-1.0.9.tar.gz) = b81c69e20d4d3cc313115de84af6ad8e07292160
+SHA1 (libmng-1.0.9.tar.gz) = d32e939ec95caff7839c6c9a5896e4d575c77d35
+SIZE (libmng-1.0.9.tar.gz) = 554848

graphics/libmng/files/makefile.openbsd

@@ -0,0 +1,74 @@
+#
+# For conditions of distribution and use, see copyright notice in libmng.h
+#
+# makefile for libmng - THE MNG library
+# this makefile is suitable for OpenBSD
+#
+
+PREFIX?= /usr/local
+LIBDIR=	${PREFIX}/lib
+MANDIR=	${PREFIX}/man/man
+INCDIR=	${PREFIX}/include
+
+ZLIB_INC= ${LOCALBASE}/include
+ZLIB_LIB= ${LOCALBASE}/lib
+
+JPEG_INC= ${LOCALBASE}/include
+JPEG_LIB= ${LOCALBASE}/lib
+
+LCMS_INC= ${LOCALBASE}/inc
+LCMS_LIB= ${LOCALBASE}/lib
+
+SHLIB_MAJOR=	3
+SHLIB_MINOR=	0
+
+LIB=	mng
+SRCS=	libmng_callback_xs.c libmng_chunk_io.c libmng_chunk_descr.c \
+	libmng_chunk_prc.c libmng_chunk_xs.c libmng_cms.c libmng_display.c \
+	libmng_dither.c libmng_error.c libmng_filter.c libmng_hlapi.c \
+	libmng_jpeg.c libmng_object_prc.c libmng_pixels.c libmng_prop_xs.c \
+	libmng_read.c libmng_trace.c libmng_write.c libmng_zlib.c
+
+HDRS=	libmng.h libmng_conf.h libmng_types.h
+
+CFLAGS+= -Wall
+CPPFLAGS+= -I${ZLIB_INC} -I${JPEG_INC} -I${LCMS_INC}
+.if !defined(NOPIC)
+CPPFLAGS+= -DMNG_BUILD_SO
+.endif
+CPPFLAGS+= -DMNG_FULL_CMS
+
+NOPROFILE= Yes
+
+MAN3=	libmng.3
+MAN5=	mng.5 jng.5
+
+beforeinstall:
+	if [ ! -d ${DESTDIR}${INCDIR} ]; then \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${INCDIR}; \
+	fi
+	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
+	fi
+	if [ ! -d ${DESTDIR}${LIBDIR}/debug ]; then \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/debug; \
+	fi
+	if [ ! -d ${DESTDIR}${MANDIR}3 ]; then \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}3; \
+	fi
+	if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
+	fi
+
+afterinstall:
+	@rm -f ${DESTDIR}${LIBDIR}/libmng_pic.a
+	@rm -f ${DESTDIR}${LIBDIR}/debug/libmng.a
+	@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
+	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
+		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${INCDIR}
+	cd doc/man; ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} \
+		-m ${MANMODE} ${MAN3} ${DESTDIR}${MANDIR}3
+	cd doc/man; ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} \
+		-m ${MANMODE} ${MAN5} ${DESTDIR}${MANDIR}5
+
+.include <bsd.lib.mk>

graphics/libmng/patches/patch-Makefile_in

@@ -1,21 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2003/12/23 23:50:56 brad Exp $
---- Makefile.in.orig	2003-03-01 11:13:28.000000000 -0500
-+++ Makefile.in	2003-12-21 23:06:42.000000000 -0500
-@@ -82,7 +82,7 @@ AUTOMAKE_OPTIONS = 1.3 foreign no-depend
- EXTRA_DIST = makefiles doc contrib
- 
- # libmng release @VERSION@
--libmng_la_LDFLAGS = -version-info 1:0:0
-+libmng_la_LDFLAGS = -version-info 2:0:0
- 
- lib_LTLIBRARIES = libmng.la
- 
-@@ -110,7 +110,7 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
- DEFS = @DEFS@ -I. -I$(srcdir) 
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = 
- libmng_la_LIBADD = 
- libmng_la_OBJECTS =  libmng_callback_xs.lo libmng_chunk_io.lo \
- libmng_chunk_prc.lo libmng_chunk_xs.lo libmng_cms.lo libmng_display.lo \

graphics/libmng/patches/patch-libmng_types_h

@@ -1,15 +0,0 @@
-$OpenBSD: patch-libmng_types_h,v 1.2 2003/05/12 04:07:56 brad Exp $
---- libmng_types.h.orig	Sat Mar  1 09:08:45 2003
-+++ libmng_types.h	Sun May 11 17:05:53 2003
-@@ -155,11 +155,7 @@
- #ifndef ZLIB_DLL
- #undef FAR
- #endif
--#if defined(WIN32) || defined(linux)   /* different header locations */
- #include "lcms.h"
--#else
--#include "lcms/lcms.h"
--#endif
- #endif /* MNG_INCLUDE_LCMS */
- 
- #ifdef MNG_INCLUDE_IJG6B               /* IJG's jpgsrc6b */

graphics/libmng/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/10 09:50:55 espie Exp $
-@lib lib/libmng.so.2.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2005/07/31 23:19:18 brad Exp $
+@lib lib/libmng.so.3.0

graphics/libmng/pkg/PLIST

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/08/10 09:50:55 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/07/31 23:19:18 brad Exp $
+%%SHARED%%
 include/libmng.h
 include/libmng_conf.h
 include/libmng_types.h
 lib/libmng.a
-lib/libmng.la
+@endfake
 @man man/man3/libmng.3
 @man man/man5/jng.5
 @man man/man5/mng.5
-%%SHARED%%