[Midnightbsd-cvs] mports [16868] trunk/graphics/jbig2dec: fix man page and fetch

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 7 00:11:18 EDT 2014


Revision: 16868
          http://svnweb.midnightbsd.org/mports/?rev=16868
Author:   laffer1
Date:     2014-09-07 00:11:17 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
fix man page and fetch

Modified Paths:
--------------
    trunk/graphics/jbig2dec/Makefile
    trunk/graphics/jbig2dec/pkg-plist

Modified: trunk/graphics/jbig2dec/Makefile
===================================================================
--- trunk/graphics/jbig2dec/Makefile	2014-09-07 04:08:02 UTC (rev 16867)
+++ trunk/graphics/jbig2dec/Makefile	2014-09-07 04:11:17 UTC (rev 16868)
@@ -2,11 +2,11 @@
 
 PORTNAME=	jbig2dec
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
-MASTER_SITES=	SF \
-		http://ghostscript.com/~giles/jbig2/jbig2dec/
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	SF
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Decoder implementation of the JBIG2 image compression format
@@ -13,10 +13,10 @@
 
 LICENSE=	gpl3
 
-USE_XZ=		yes:src
+USES=		tar:xz libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAKE_JOBS_SAFE=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	PNG TESTS
 OPTIONS_DEFAULT=	PNG
@@ -23,29 +23,23 @@
 
 TESTS_DESC=	Download and use test-images for post-build testing
 
-MAN1=		jbig2dec.1
-
-MAKE_JOBS_SAFE=	yes
 EXTRACT_AFTER_ARGS+=	--exclude sha1.h --exclude 'getopt*'
 
+PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_ON=	--with-libpng=${LOCALBASE}
+PNG_CFLAGS=		-I${LOCALBASE}/include/libpng15
+
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=--with-libpng=${LOCALBASE}
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
-.endif
-
 .if ${PORT_OPTIONS:MTESTS}
 MASTER_SITES+=	http://jbig2dec.sourceforge.net/ubc/:tests
 DISTFILES+=	jb2streams.zip:tests
-EXTRACT_ONLY=	${DISTFILES:M*xz}
 USE_PYTHON_BUILD=yes
 KNOWN_BAD_JB2S=	042_11 042_13 042_14 042_24 042_25 amb_1 amb_2
 
 post-extract:
-	${MKDIR} ${WRKDIR}/ubc
-	${TAR} -C ${WRKDIR}/ubc/ -xpf ${DISTDIR}/jb2streams.zip \
+	@${MKDIR} ${WRKDIR}/ubc
+	@${TAR} -C ${WRKDIR}/ubc/ -xpf ${DISTDIR}/jb2streams.zip \
 		${KNOWN_BAD_JB2S:S/$/.jb2/:S/^/--exclude /}
 .else
 EXTRA_PATCHES=	${FILESDIR}/simpler-test-patch
@@ -55,8 +49,10 @@
 .if ${PORT_OPTIONS:MPNG}
 	@${REINPLACE_CMD} 's/png_check_sig/png_sig_cmp/g' ${WRKSRC}/configure
 .endif
-	${REINPLACE_CMD} -E 's|SHA1_Final\( *([^,]+), *([^\)]+)\)|SHA1_Final(\2, \1)|' \
+	@${REINPLACE_CMD} -E 's|SHA1_Final\( *([^,]+), *([^\)]+)\)|SHA1_Final(\2, \1)|' \
 		${WRKSRC}/jbig2dec.c ${WRKSRC}/sha1.c
+	@${REINPLACE_CMD} -e '1 s|${SETENV} python|${PYTHON_CMD}|' \
+		${WRKSRC}/test_jbig2dec.py
 
 test check regression-test:
 	${MAKE} -C ${WRKSRC} check-TESTS

Modified: trunk/graphics/jbig2dec/pkg-plist
===================================================================
--- trunk/graphics/jbig2dec/pkg-plist	2014-09-07 04:08:02 UTC (rev 16867)
+++ trunk/graphics/jbig2dec/pkg-plist	2014-09-07 04:11:17 UTC (rev 16868)
@@ -1,6 +1,6 @@
 bin/jbig2dec
 include/jbig2.h
 lib/libjbig2dec.a
-lib/libjbig2dec.la
 lib/libjbig2dec.so
 lib/libjbig2dec.so.0
+man/man1/jbig2dec.1.gz



More information about the Midnightbsd-cvs mailing list