- Have the dynamic library link against its dependencies.

- Remove USE_GROFF.
- Fix mistake with the LCMS header path in the libmng Makefile.
- port and libmng Makefile clean up.

from Brad

Remove @endfake while here

graphics/libmng/Makefile

@@ -1,20 +1,18 @@
-# $OpenBSD: Makefile,v 1.22 2010/11/17 08:05:14 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2012/09/02 10:25:13 ajacoutot Exp $
 
 COMMENT=	Multiple-image Network Graphics (MNG) reference library
 
 DISTNAME=	lm010010
 PKGNAME=	libmng-1.0.10
-SHARED_LIBS=	mng	3.1
+REVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libmng/}
 EXTRACT_SUFX=	.zip
 UNZIP=		unzip -a
 
-HOMEPAGE=	http://www.libmng.com/
+SHARED_LIBS=	mng	3.1
 
-LIB_DEPENDS=	graphics/jpeg \
-		graphics/lcms
-WANTLIB =	jpeg>=62 lcms
+HOMEPAGE=	http://www.libmng.com/
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -22,6 +20,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+WANTLIB=	jpeg lcms m z
+
+LIB_DEPENDS=	graphics/jpeg \
+		graphics/lcms
+
 FAKE_FLAGS=	PREFIX="${PREFIX}"
 
 MAKE_ENV=	CC="${CC}" \
@@ -31,7 +34,6 @@ MAKE_FILE=	makefiles/makefile.openbsd
 
 WRKDIST=	${WRKDIR}/libmng
 
-USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
 post-extract:

graphics/libmng/files/makefile.openbsd

@@ -10,13 +10,10 @@ 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_INC= ${LOCALBASE}/include
 LCMS_LIB= ${LOCALBASE}/lib
 
 LIB=	mng
@@ -29,11 +26,12 @@ SRCS=	libmng_callback_xs.c libmng_chunk_io.c libmng_chunk_descr.c \
 HDRS=	libmng.h libmng_conf.h libmng_types.h
 
 CFLAGS+= -Wall
-CPPFLAGS+= -I${ZLIB_INC} -I${JPEG_INC} -I${LCMS_INC}
+CPPFLAGS+= -I${JPEG_INC} -I${LCMS_INC}
 .if !defined(NOPIC)
 CPPFLAGS+= -DMNG_BUILD_SO
 .endif
 CPPFLAGS+= -DMNG_FULL_CMS
+LDADD= -lz -lm -L${JPEG_LIB} -ljpeg -L${LCMS_LIB} -llcms
 
 NOPROFILE= Yes
 
@@ -58,7 +56,6 @@ beforeinstall:
 	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} \

graphics/libmng/pkg/PLIST

@@ -1,10 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/07/31 23:19:18 brad Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/09/02 10:25:13 ajacoutot Exp $
 %%SHARED%%
 include/libmng.h
 include/libmng_conf.h
 include/libmng_types.h
 lib/libmng.a
-@endfake
 @man man/man3/libmng.3
 @man man/man5/jng.5
 @man man/man5/mng.5