svn commit: r374475 - in head/graphics: giflib giflib/files jpeg

Antoine Brodin antoine at FreeBSD.org
Wed Dec 10 15:52:23 UTC 2014 

Author: antoine
Date: Wed Dec 10 15:52:21 2014
New Revision: 374475
URL: https://svnweb.freebsd.org/changeset/ports/374475
QAT: https://qat.redports.org/buildarchive/r374475/

Log:
  Restore those ports to their previous state
  No PORTEPOCH needed as they didn't build

Added:
  head/graphics/giflib/files/
     - copied from r374469, head/graphics/giflib/files/
Modified:
  head/graphics/giflib/Makefile
  head/graphics/giflib/distinfo
  head/graphics/giflib/pkg-plist
  head/graphics/jpeg/Makefile
  head/graphics/jpeg/distinfo
  head/graphics/jpeg/pkg-plist

Modified: head/graphics/giflib/Makefile
==============================================================================
--- head/graphics/giflib/Makefile	Wed Dec 10 15:52:14 2014	(r374474)
+++ head/graphics/giflib/Makefile	Wed Dec 10 15:52:21 2014	(r374475)
@@ -2,27 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	giflib
-PORTVERSION=	5.0.6
+PORTVERSION=	4.2.3
+PORTREVISION=	4
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x
 PKGNAMESUFFIX=	${NOX11SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	portmgr at FreeBSD.org
 COMMENT=	Tools and library routines for working with GIF images
 
 CONFLICTS=	libungif-[0-9]*
+PORTSCOUT=	limit:^4\.
 
-USES=		tar:bzip2 libtool
+USES=		tar:bzip2 libtool shebangfix
+SHEBANG_FILES=	${WRKSRC}/util/gifburst
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-LMAN1=		gif2raw.1 gif2rgb.1 gifbuild.1 gifclrmp.1 gifecho.1 \
-		giffix.1 gifinto.1 giflib.1 giftext.1 giftool.1
+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 DOCS
+OPTIONS_DEFINE=	DOCBOOK X11 DOCS
 OPTIONS_SUB=	yes
 DOCBOOK_DESC=	Generate API documentation (requires DOCS)
 
+X11_CONFIGURE_ENABLE=	x11
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
@@ -30,7 +37,16 @@ BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textpr
 	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
 .endif
 
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	x11 sm ice
+CPPFLAGS+=	-I${LOCALBASE}/include
+LMAN1+=		gif2x11.1
+.else
+NOX11SUFFIX=	-nox11
+.endif
+
 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|' \
@@ -38,7 +54,7 @@ post-patch:
 .endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgif.so.6.0.1
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgif.so.4
 .for i in ${LMAN1}
 	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${PREFIX}/man/man1/
 .endfor
@@ -46,7 +62,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}/
-.else
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/giflib/distinfo
==============================================================================
--- head/graphics/giflib/distinfo	Wed Dec 10 15:52:14 2014	(r374474)
+++ head/graphics/giflib/distinfo	Wed Dec 10 15:52:21 2014	(r374475)
@@ -1,2 +1,2 @@
-SHA256 (giflib-5.0.6.tar.bz2) = 8909839ccbdfca75cfbe6a4db907b55978e11fb268a8f3cde24bd923a0f669ea
-SIZE (giflib-5.0.6.tar.bz2) = 621073
+SHA256 (giflib-4.2.3.tar.bz2) = 0ac8d56726f77c8bc9648c93bbb4d6185d32b15ba7bdb702415990f96f3cb766
+SIZE (giflib-4.2.3.tar.bz2) = 560968

Modified: head/graphics/giflib/pkg-plist
==============================================================================
--- head/graphics/giflib/pkg-plist	Wed Dec 10 15:52:14 2014	(r374474)
+++ head/graphics/giflib/pkg-plist	Wed Dec 10 15:52:21 2014	(r374475)
@@ -1,43 +1,90 @@
-bin/gif2raw
 bin/gif2rgb
-bin/gifbuild
+%%X11%%bin/gif2x11
+bin/gifasm
+bin/gifbg
+bin/gifburst
+bin/gifclip
 bin/gifclrmp
-bin/gifecho
+bin/gifcolor
+bin/gifcomb
+bin/gifcompose
+bin/giffiltr
 bin/giffix
+bin/gifflip
+bin/gifhisto
+bin/gifinfo
+bin/gifinter
 bin/gifinto
+bin/gifovly
+bin/gifpos
+bin/gifrotat
+bin/gifrsize
+bin/gifspnge
 bin/giftext
-bin/giftool
+bin/gifwedge
+bin/icon2gif
+bin/raw2gif
+bin/rgb2gif
+bin/text2gif
 include/gif_lib.h
 lib/libgif.a
 lib/libgif.so
-lib/libgif.so.6
-lib/libgif.so.6.0.1
-man/man1/gif2raw.1.gz
+lib/libgif.so.4
+lib/libgif.so.4.1.7
 man/man1/gif2rgb.1.gz
-man/man1/gifbuild.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/gifecho.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/giflib.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/giftool.1.gz
-%%DOCBOOK%%%%DOCSDIR%%/gif2raw.html
+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%%/gif87.txt
+%%DOCBOOK%%%%DOCSDIR%%/gif2x11.html
 %%DOCBOOK%%%%DOCSDIR%%/gif89.txt
-%%DOCBOOK%%%%DOCSDIR%%/gifbg.html
 %%DOCBOOK%%%%DOCSDIR%%/gif_lib.html
-%%DOCBOOK%%%%DOCSDIR%%/gifbuild.html
+%%DOCBOOK%%%%DOCSDIR%%/gifasm.html
+%%DOCBOOK%%%%DOCSDIR%%/gifbg.html
+%%DOCBOOK%%%%DOCSDIR%%/gifclip.html
 %%DOCBOOK%%%%DOCSDIR%%/gifclrmp.html
 %%DOCBOOK%%%%DOCSDIR%%/gifcolor.html
-%%DOCBOOK%%%%DOCSDIR%%/gifecho.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%%/giflib.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%%/giftool.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

Modified: head/graphics/jpeg/Makefile
==============================================================================
--- head/graphics/jpeg/Makefile	Wed Dec 10 15:52:14 2014	(r374474)
+++ head/graphics/jpeg/Makefile	Wed Dec 10 15:52:21 2014	(r374475)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	jpeg
-PORTVERSION=	9
-PORTREVISION=	0
+PORTVERSION=	8
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ijg.org/files/ \
 		http://sylvana.net/jpegcrop/:exif
@@ -19,7 +19,7 @@ COMMENT=	IJG's jpeg compression utilitie
 #CONFLICTS=	libjpeg-turbo-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION2}
-DISTVERSION2=	9
+DISTVERSION2=	8d
 USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -48,7 +48,7 @@ test: build
 regression-test:	test
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjpeg.so.9.0.0
+	${LN} -s libjpeg.so.8 ${STAGEDIR}${PREFIX}/lib/libjpeg.so.11
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/jpeg
 	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/jpeg/

Modified: head/graphics/jpeg/distinfo
==============================================================================
--- head/graphics/jpeg/distinfo	Wed Dec 10 15:52:14 2014	(r374474)
+++ head/graphics/jpeg/distinfo	Wed Dec 10 15:52:21 2014	(r374475)
@@ -1,6 +1,6 @@
-SHA256 (jpeg9/jpegsrc.v9.tar.gz) = c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535
-SIZE (jpeg9/jpegsrc.v9.tar.gz) = 987900
-SHA256 (jpeg9/jpegexiforient.c) = bac06fcdbc6a5b6adfb5e65d5b90b88bf7d72849e21ab2d33b6900bd99200eec
-SIZE (jpeg9/jpegexiforient.c) = 8531
-SHA256 (jpeg9/exifautotran.txt) = d1d8302e4a76f83c725d65027ff5dfd788447cc245d387a91f01737e9f245c4c
-SIZE (jpeg9/exifautotran.txt) = 684
+SHA256 (jpeg8d/jpegsrc.v8d.tar.gz) = 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3
+SIZE (jpeg8d/jpegsrc.v8d.tar.gz) = 991456
+SHA256 (jpeg8d/jpegexiforient.c) = bac06fcdbc6a5b6adfb5e65d5b90b88bf7d72849e21ab2d33b6900bd99200eec
+SIZE (jpeg8d/jpegexiforient.c) = 8531
+SHA256 (jpeg8d/exifautotran.txt) = d1d8302e4a76f83c725d65027ff5dfd788447cc245d387a91f01737e9f245c4c
+SIZE (jpeg8d/exifautotran.txt) = 684

Modified: head/graphics/jpeg/pkg-plist
==============================================================================
--- head/graphics/jpeg/pkg-plist	Wed Dec 10 15:52:14 2014	(r374474)
+++ head/graphics/jpeg/pkg-plist	Wed Dec 10 15:52:21 2014	(r374475)
@@ -13,8 +13,9 @@ include/jpegint.h
 include/jpeglib.h
 lib/libjpeg.a
 lib/libjpeg.so
-lib/libjpeg.so.9
-lib/libjpeg.so.9.0.0
+lib/libjpeg.so.11
+lib/libjpeg.so.8
+lib/libjpeg.so.8.4.0
 man/man1/cjpeg.1.gz
 man/man1/djpeg.1.gz
 man/man1/jpegtran.1.gz

More information about the svn-ports-head mailing list