[Midnightbsd-cvs] mports [17284] trunk/graphics/giflib: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 15 00:27:07 EDT 2014


Revision: 17284
          http://svnweb.midnightbsd.org/mports/?rev=17284
Author:   laffer1
Date:     2014-09-15 00:27:06 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
fix build

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

Modified: trunk/graphics/giflib/Makefile
===================================================================
--- trunk/graphics/giflib/Makefile	2014-09-15 04:25:09 UTC (rev 17283)
+++ trunk/graphics/giflib/Makefile	2014-09-15 04:27:06 UTC (rev 17284)
@@ -2,6 +2,7 @@
 
 PORTNAME=	giflib
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x
 PKGNAMESUFFIX=	${NOX11SUFFIX}${PKGNAMESUFFIX2}
@@ -13,32 +14,34 @@
 
 CONFLICTS=	libungif-[0-9]*
 
-USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool
+USES=		tar:bzip2 libtool:oldver shebangfix
+SHEBANG_FILES=	${WRKSRC}/util/gifburst
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCBOOK X11
-OPTIONS_DEFAULT=	X11
+LMAN1=	gif2rgb.1 gifasm.1 gifbg.1 gifclip.1 gifclrmp.1 gifcolor.1 gifcomb.1 \
+	gifcompose.1 giffiltr.1 giffix.1 gifflip.1 gifhisto.1 gifinter.1 \
+	gifinto.1 gifovly.1 gifpos.1 gifrotat.1 gifrsize.1 gifspnge.1 \
+	giftext.1 gifwedge.1 icon2gif.1 raw2gif.1 rgb2gif.1 text2gif.1
+
+OPTIONS_DEFINE=	DOCBOOK X11 DOCS
+OPTIONS_SUB=	yes
 DOCBOOK_DESC=	Generate API documentation (requires DOCS)
 
-.include <bsd.port.pre.mk>
+X11_CONFIGURE_ENABLE=	x11
 
+.include <bsd.mport.options.mk>
+
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
-		${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
-PLIST_SUB+=	WITH_DOCBOOK=''
-.else
-PLIST_SUB+=	WITH_DOCBOOK='@comment '
+	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_XORG=	sm x11
-PLIST_SUB+=	X11=''
+USE_XORG=	x11 sm ice
 CPPFLAGS+=	-I${LOCALBASE}/include
+LMAN1+=		gif2x11.1
 .else
-PLIST_SUB+=	X11='@comment '
-CONFIGURE_ARGS+=	--with-x=no
 NOX11SUFFIX=	-nox11
 .endif
 
@@ -45,15 +48,20 @@
 post-patch:
 	${CP} ${FILESDIR}/quantize.c ${WRKSRC}/lib/
 .if ! ${PORT_OPTIONS:MDOCBOOK} || ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
+	${REINPLACE_CMD} \
+		-e 's|SUBDIRS = lib util doc pic|SUBDIRS = lib util pic|' \
 		${WRKSRC}/Makefile.in
 .endif
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgif.so.5
+.for i in ${LMAN1}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${PREFIX}/man/man1/
+.endfor
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/graphics/giflib/pkg-plist
===================================================================
--- trunk/graphics/giflib/pkg-plist	2014-09-15 04:25:09 UTC (rev 17283)
+++ trunk/graphics/giflib/pkg-plist	2014-09-15 04:27:06 UTC (rev 17284)
@@ -31,35 +31,61 @@
 lib/libgif.la
 lib/libgif.so
 lib/libgif.so.5
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif2rgb.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif2x11.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif89.txt
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gif_lib.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifasm.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifbg.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifclip.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifclrmp.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifcolor.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifcomb.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifcompose.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/giffiltr.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/giffix.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifflip.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifhisto.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifinter.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifinto.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifovly.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifpos.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifrotat.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifrsize.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifspnge.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/giftext.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/gifwedge.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/icon2gif.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/intro.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/liberror.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/lzgif.txt
-%%WITH_DOCBOOK%%%%DOCSDIR%%/raw2gif.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/rgb2gif.html
-%%WITH_DOCBOOK%%%%DOCSDIR%%/text2gif.html
-%%WITH_DOCBOOK%%@dirrm %%DOCSDIR%%
+man/man1/gif2rgb.1.gz
+%%X11%%man/man1/gif2x11.1.gz
+man/man1/gifasm.1.gz
+man/man1/gifbg.1.gz
+man/man1/gifclip.1.gz
+man/man1/gifclrmp.1.gz
+man/man1/gifcolor.1.gz
+man/man1/gifcomb.1.gz
+man/man1/gifcompose.1.gz
+man/man1/giffiltr.1.gz
+man/man1/giffix.1.gz
+man/man1/gifflip.1.gz
+man/man1/gifhisto.1.gz
+man/man1/gifinter.1.gz
+man/man1/gifinto.1.gz
+man/man1/gifovly.1.gz
+man/man1/gifpos.1.gz
+man/man1/gifrotat.1.gz
+man/man1/gifrsize.1.gz
+man/man1/gifspnge.1.gz
+man/man1/giftext.1.gz
+man/man1/gifwedge.1.gz
+man/man1/icon2gif.1.gz
+man/man1/raw2gif.1.gz
+man/man1/rgb2gif.1.gz
+man/man1/text2gif.1.gz
+%%DOCBOOK%%%%DOCSDIR%%/gif2rgb.html
+%%DOCBOOK%%%%DOCSDIR%%/gif2x11.html
+%%DOCBOOK%%%%DOCSDIR%%/gif89.txt
+%%DOCBOOK%%%%DOCSDIR%%/gif_lib.html
+%%DOCBOOK%%%%DOCSDIR%%/gifasm.html
+%%DOCBOOK%%%%DOCSDIR%%/gifbg.html
+%%DOCBOOK%%%%DOCSDIR%%/gifclip.html
+%%DOCBOOK%%%%DOCSDIR%%/gifclrmp.html
+%%DOCBOOK%%%%DOCSDIR%%/gifcolor.html
+%%DOCBOOK%%%%DOCSDIR%%/gifcomb.html
+%%DOCBOOK%%%%DOCSDIR%%/gifcompose.html
+%%DOCBOOK%%%%DOCSDIR%%/giffiltr.html
+%%DOCBOOK%%%%DOCSDIR%%/giffix.html
+%%DOCBOOK%%%%DOCSDIR%%/gifflip.html
+%%DOCBOOK%%%%DOCSDIR%%/gifhisto.html
+%%DOCBOOK%%%%DOCSDIR%%/gifinter.html
+%%DOCBOOK%%%%DOCSDIR%%/gifinto.html
+%%DOCBOOK%%%%DOCSDIR%%/gifovly.html
+%%DOCBOOK%%%%DOCSDIR%%/gifpos.html
+%%DOCBOOK%%%%DOCSDIR%%/gifrotat.html
+%%DOCBOOK%%%%DOCSDIR%%/gifrsize.html
+%%DOCBOOK%%%%DOCSDIR%%/gifspnge.html
+%%DOCBOOK%%%%DOCSDIR%%/giftext.html
+%%DOCBOOK%%%%DOCSDIR%%/gifwedge.html
+%%DOCBOOK%%%%DOCSDIR%%/icon2gif.html
+%%DOCBOOK%%%%DOCSDIR%%/intro.html
+%%DOCBOOK%%%%DOCSDIR%%/liberror.html
+%%DOCBOOK%%%%DOCSDIR%%/lzgif.txt
+%%DOCBOOK%%%%DOCSDIR%%/raw2gif.html
+%%DOCBOOK%%%%DOCSDIR%%/rgb2gif.html
+%%DOCBOOK%%%%DOCSDIR%%/text2gif.html
+%%DOCBOOK%%@dirrm %%DOCSDIR%%



More information about the Midnightbsd-cvs mailing list