Attachment #250280 for bug #278621

View | Details | Raw Unified | Return to bug 278621
Collapse All | Expand All




PORTNAME=	giflib
PORTVERSION=	5.2.2
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	SF/${PORTNAME}



OPTIONS_DEFINE=	DOCS

post-patch:
# Missing giflib-logo.gif fixed upstream in commit d54b45.
	@${CP} ${WRKSRC}/pic/gifgrid.gif ${WRKSRC}/doc/giflib-logo.gif
	@${REINPLACE_CMD} \
		's/src="[./]*giflib-logo.gif"/& height="50" width="50"/' \
		${WRKSRC}/doc/index.html* ${WRKSRC}/doc/whatsinagif/*.html

do-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
		"! ( -name Makefile -o -name *\.[17] -o -name *\.xml )"
	${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html

pre-build:
	${CP} ${FILESDIR}/giflib-logo.gif ${WRKSRC}/doc

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.2.0




--- Makefile.orig	2024-02-19 01:01:50 UTC
+++ Makefile
@@ -63,15 +63,19 @@ LDLIBS=libgif.a -lm
 
 LDLIBS=libgif.a -lm
 
-MANUAL_PAGES = \
+MANUAL_PAGES_1 = \
 	doc/gif2rgb.xml \
 	doc/gifbuild.xml \
 	doc/gifclrmp.xml \
 	doc/giffix.xml \
-	doc/giflib.xml \
 	doc/giftext.xml \
 	doc/giftool.xml
+	doc/gif2rgb.1 \
+	doc/gifbuild.1 \
+	doc/gifclrmp.1 \
+	doc/giffix.1 \
+	doc/giftext.1 \
+	doc/giftool.1
+MAN7_PAGES= \
+	doc/giflib.7
 
+MANUAL_PAGES_7 = \
+	doc/giflib.xml
+
+MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
+
 SOEXTENSION	= so
 LIBGIFSO	= libgif.$(SOEXTENSION)
 LIBGIFSOMAJOR	= libgif.$(SOEXTENSION).$(LIBMAJOR)
@@ -148,8 +152,9 @@ install-man:
 	ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
 	ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
 install-man:
-	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
-	$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
+	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
+	$(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
+	$(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
 uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
 uninstall-bin:
 	cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)

Lines 1-6 Link Here

(-)b/graphics/giflib/files/patch-tests_makefile (-2 / +1 lines)
1	--- tests/makefile.orig 2019-03-28 17:05:25 UTC	1	--- tests/makefile.orig 2019-03-28 17:05:25 UTC
2	+++ tests/makefile	2	+++ tests/makefile
3	@@ -104,10 +106,10 @@ giffilter-regress:	3	@@ -104,10 +104,10 @@ giffix-rebuild:
4		4
5	giffix-rebuild:	5	giffix-rebuild:
6	@echo "Rebuilding giffix test."	6	@echo "Rebuilding giffix test."
7	-

Return to bug 278621

Lines 1-5 Link Here

(-)b/graphics/giflib/Makefile (-3 / +8 lines)
1	PORTNAME= giflib	1	PORTNAME= giflib
2	PORTVERSION= 5.2.2	2	PORTVERSION= 5.2.2
		3	PORTREVISION= 1
3	CATEGORIES= graphics	4	CATEGORIES= graphics
4	MASTER_SITES= SF/${PORTNAME}	5	MASTER_SITES= SF/${PORTNAME}
5		6
Lines 28-42 CONFLICTS_INSTALL= giftool Link Here
28		29
29	OPTIONS_DEFINE= DOCS	30	OPTIONS_DEFINE= DOCS
30		31
		32	post-patch:
		33	# Missing giflib-logo.gif fixed upstream in commit d54b45.
		34	@${CP} ${WRKSRC}/pic/gifgrid.gif ${WRKSRC}/doc/giflib-logo.gif
		35	@${REINPLACE_CMD} \
		36	's/src="[./]*giflib-logo.gif"/& height="50" width="50"/' \
		37	${WRKSRC}/doc/index.html* ${WRKSRC}/doc/whatsinagif/*.html
		38
31	do-install-DOCS-on:	39	do-install-DOCS-on:
32	${MKDIR} ${STAGEDIR}${DOCSDIR}	40	${MKDIR} ${STAGEDIR}${DOCSDIR}
33	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \	41	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
34	"! ( -name Makefile -o -name \.[17] -o -name \.xml )"	42	"! ( -name Makefile -o -name \.[17] -o -name \.xml )"
35	${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html	43	${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html
36		44
37	pre-build:
38	${CP} ${FILESDIR}/giflib-logo.gif ${WRKSRC}/doc
39
40	post-install:	45	post-install:
41	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*	46	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
42	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.2.0	47	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.2.0

Lines 1-33 Link Here

(-)b/graphics/giflib/files/patch-Makefile (-21 / +24 lines)
1	--- Makefile.orig 2024-02-19 01:01:50 UTC	1	--- Makefile.orig 2024-02-19 01:01:50 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -64,13 +64,14 @@ MANUAL_PAGES = \	3	@@ -63,15 +63,19 @@ LDLIBS=libgif.a -lm
		4
4	LDLIBS=libgif.a -lm	5	LDLIBS=libgif.a -lm
5		6
6	MANUAL_PAGES = \	7	-MANUAL_PAGES = \
7	- doc/gif2rgb.xml \	8	+MANUAL_PAGES_1 = \
8	- doc/gifbuild.xml \	9	doc/gif2rgb.xml \
9	- doc/gifclrmp.xml \	10	doc/gifbuild.xml \
10	- doc/giffix.xml \	11	doc/gifclrmp.xml \
		12	doc/giffix.xml \
11	- doc/giflib.xml \	13	- doc/giflib.xml \
12	- doc/giftext.xml \	14	doc/giftext.xml \
13	- doc/giftool.xml	15	doc/giftool.xml
14	+ doc/gif2rgb.1 \
15	+ doc/gifbuild.1 \
16	+ doc/gifclrmp.1 \
17	+ doc/giffix.1 \
18	+ doc/giftext.1 \
19	+ doc/giftool.1
20	+MAN7_PAGES= \
21	+ doc/giflib.7
22		16
		17	+MANUAL_PAGES_7 = \
		18	+ doc/giflib.xml
		19	+
		20	+MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
		21	+
23	SOEXTENSION = so	22	SOEXTENSION = so
24	LIBGIFSO = libgif.$(SOEXTENSION)	23	LIBGIFSO = libgif.$(SOEXTENSION)
25	@@ -150,6 +151,8 @@ install-man:	24	LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
		25	@@ -148,8 +152,9 @@ install-man:
		26	ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
		27	ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
26	install-man:	28	install-man:
27	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"	29	- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
28	$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"	30	- $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
29	+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man7"	31	+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
30	+ $(INSTALL) -m 644 $(MAN7_PAGES) "$(DESTDIR)$(MANDIR)/man7"	32	+ $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
		33	+ $(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
31	uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin	34	uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
32	uninstall-bin:	35	uninstall-bin:
33	cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)	36	cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)