From 2f1180b86abefff06ae15d1b4a2502d41d431b76 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 9 Oct 2013 17:38:26 +0000 Subject: [PATCH] Update to 2.0.2. Now depends on lcms2 instead of lcms, and the major version was bumped (recursive bump following next). 2.0.1 (19.01.2013) --------------------------- [szukw000@arcor.de] There has been a change in JPEG version 9: added some code in libmng_types.h before #include 2.0.0 (dd.mm.2012) --------------------------- Allows lcms1/lcms2: ./configure --with-lcms2 cmake -DWITH_LCMS2:bool=on Cnf. the sample files 'Configure.libmng' and 'build-mng-cmake.sh' and 'cmake-compile.bat' resp. 'clean.bat' szukw000@arcor.de --- graphics/mng/Makefile | 32 ++++--------------- graphics/mng/PLIST | 3 +- graphics/mng/buildlink3.mk | 6 ++-- graphics/mng/distinfo | 9 +++--- .../mng/patches/patch-makefiles-configure_in | 21 ------------ 5 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 graphics/mng/patches/patch-makefiles-configure_in diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile index be593431ca5d6..ca0b4c4c77989 100644 --- a/graphics/mng/Makefile +++ b/graphics/mng/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2013/01/26 21:36:31 adam Exp $ +# $NetBSD: Makefile,v 1.40 2013/10/09 17:38:26 wiz Exp $ -DISTNAME= libmng-1.0.10 -PKGNAME= mng-1.0.10 -PKGREVISION= 3 +DISTNAME= libmng-2.0.2 +PKGNAME= ${DISTNAME:S/lib//} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libmng/} \ http://www.libmng.com/download/ @@ -11,40 +10,23 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.libmng.com/ COMMENT= Multiple-image Network Graphics (MNG) reference library -# Waiting for automake to be pkgviews-enabled -#PKG_INSTALLATION_TYPES= overwrite pkgviews - GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= aclocal autoconf automake -LIBTOOLIZE= ${LIBTOOL:S/libtool$/libtoolize/} CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE} -CONFIGURE_ARGS+= --with-lcms=${BUILDLINK_PREFIX.lcms} -CPPFLAGS+= ${BUILDLINK_CPPFLAGS.lcms} +CONFIGURE_ARGS+= --with-lcms2 DOCDIR= ${PREFIX}/share/doc/mng -INSTALLATION_DIRS= ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 ${DOCDIR} +PKGCONFIG_OVERRIDE= libmng.pc.in -pre-configure: - ${RM} -f ${WRKSRC}/configure.in ${WRKSRC}/Makefile.am - ${LN} -s makefiles/configure.in makefiles/Makefile.am ${WRKSRC} - cd ${WRKSRC} && aclocal - cd ${WRKSRC} && ${LIBTOOLIZE} --automake - cd ${WRKSRC} && automake -a --foreign -i - cd ${WRKSRC} && autoconf +INSTALLATION_DIRS= ${DOCDIR} post-install: cd ${WRKSRC}/doc && \ ${INSTALL_DATA} Plan1.png Plan2.png libmng.txt ${DESTDIR}${DOCDIR} - cd ${WRKSRC}/doc/man && \ - ${INSTALL_MAN} libmng.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 - cd ${WRKSRC}/doc/man && \ - ${INSTALL_MAN} jng.5 mng.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/lcms/buildlink3.mk" - +.include "../../graphics/lcms2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mng/PLIST b/graphics/mng/PLIST index 5410305ef5893..bbdfec11ff58e 100644 --- a/graphics/mng/PLIST +++ b/graphics/mng/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:23 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/10/09 17:38:26 wiz Exp $ include/libmng.h include/libmng_conf.h include/libmng_types.h lib/libmng.la +lib/pkgconfig/libmng.pc man/man3/libmng.3 man/man5/jng.5 man/man5/mng.5 diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk index 0d00a986c79f3..8cd9fbe9e99ee 100644 --- a/graphics/mng/buildlink3.mk +++ b/graphics/mng/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2013/01/26 21:36:31 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2013/10/09 17:38:26 wiz Exp $ BUILDLINK_TREE+= mng @@ -6,12 +6,12 @@ BUILDLINK_TREE+= mng MNG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mng+= mng>=1.0.0 -BUILDLINK_ABI_DEPENDS.mng+= mng>=1.0.10nb3 +BUILDLINK_ABI_DEPENDS.mng+= mng>=2.0.2 BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/lcms/buildlink3.mk" +.include "../../graphics/lcms2/buildlink3.mk" .endif # MNG_BUILDLINK3_MK BUILDLINK_TREE+= -mng diff --git a/graphics/mng/distinfo b/graphics/mng/distinfo index 1fb02d011f9ba..5801ccf3e704d 100644 --- a/graphics/mng/distinfo +++ b/graphics/mng/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.12 2012/04/29 17:17:59 dholland Exp $ +$NetBSD: distinfo,v 1.13 2013/10/09 17:38:26 wiz Exp $ -SHA1 (libmng-1.0.10.tar.gz) = 78ad516a1de79d00de720bf2a7c9afea2c896b09 -RMD160 (libmng-1.0.10.tar.gz) = ed09e537ebb129f5e13cba56d9d2c2a106955393 -Size (libmng-1.0.10.tar.gz) = 1093337 bytes -SHA1 (patch-makefiles-configure_in) = 803aac04dd21f557ba98bda0a5b2482be7e6e83f +SHA1 (libmng-2.0.2.tar.gz) = ed63ebddb3d556a730024e2d6a6e00b8c0f5bc41 +RMD160 (libmng-2.0.2.tar.gz) = 5ba74707ba1941e345914bf2aa7025d23f3359bc +Size (libmng-2.0.2.tar.gz) = 1559967 bytes diff --git a/graphics/mng/patches/patch-makefiles-configure_in b/graphics/mng/patches/patch-makefiles-configure_in deleted file mode 100644 index 7816292a7fe2a..0000000000000 --- a/graphics/mng/patches/patch-makefiles-configure_in +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-makefiles-configure_in,v 1.1 2012/04/29 17:17:59 dholland Exp $ - -Disable stuff that is not supported by the latest autoconf. - ---- makefiles/configure.in~ 2005-01-30 10:28:00.000000000 +0000 -+++ makefiles/configure.in -@@ -15,10 +15,10 @@ AC_SUBST(VERSION) - dnl Checks for programs. - AC_PROG_CC - AC_ISC_POSIX --AM_C_PROTOTYPES --if test "x$U" != "x"; then -- AC_MSG_ERROR(Compiler not ANSI compliant) --fi -+dnl AM_C_PROTOTYPES -+dnl if test "x$U" != "x"; then -+dnl AC_MSG_ERROR(Compiler not ANSI compliant) -+dnl fi - AM_PROG_LIBTOOL - AC_PROG_INSTALL -