Attachment #208934 for bug #241777

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

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557928206	1	TIMESTAMP = 1573111142
2	SHA256 (giflib-5.1.9.tar.gz) = 36ccab06aa43e5d608cdd74902f89c47fd55c348009798434ba5798967454057	2	SHA256 (giflib-5.2.1.tar.gz) = 31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd
3	SIZE (giflib-5.1.9.tar.gz) = 385068	3	SIZE (giflib-5.2.1.tar.gz) = 444187




--- Makefile.orig	2019-06-24 16:08:57 UTC
+++ Makefile
@@ -8,7 +8,7 @@
 #

 UHEADERS = getarg.h
 UOBJECTS = $(USOURCES:.c=.o)
 
@@ -59,15 +59,21 @@ UTILS = $(INSTALLABLE) \
 	gifsponge \
 	gifwedge
 

 
 libgif.a: $(OBJECTS) $(HEADERS)
 	$(AR) rcs libgif.a $(OBJECTS)
@@ -90,16 +96,16 @@ check: all
 # Installation/uninstallation
 
 install: all install-bin install-include install-lib install-man
-install-bin: $(INSTALLABLE)
+install-bin: $(UTILS)
 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-	$(INSTALL) $^ "$(DESTDIR)$(BINDIR)"
+	$(INSTALL) -s $^ "$(DESTDIR)$(BINDIR)"
 install-include:
 	$(INSTALL) -d "$(DESTDIR)$(INCDIR)"
 	$(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)"
 install-lib:
 	$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
 	$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
-	$(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
+	$(INSTALL) -s -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
 	ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
 	ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
 install-man:




# $FreeBSD: head/graphics/giflib/Makefile 503451 2019-06-04 08:23:41Z antoine $

PORTNAME=	giflib
PORTVERSION=	5.2.1
PORTREVISION=	0
CATEGORIES=	graphics
MASTER_SITES=	SF/${PORTNAME}


	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! ( -name Makefile -o -name *\.1 -o -name *\.in -o -name *\.xml )"

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

.include <bsd.port.mk>




bin/gif2rgb
bin/gifbg
bin/gifbuild
bin/gifclrmp
bin/gifcolor
bin/gifecho
bin/giffilter
bin/giffix
bin/gifhisto
bin/gifinto
bin/gifsponge
bin/giftext
bin/giftool
bin/gifwedge
include/gif_lib.h
lib/libgif.a
lib/libgif.so
lib/libgif.so.7
lib/libgif.so.7.2.0
man/man1/gif2rgb.1.gz
man/man1/gifbg.1.gz
man/man1/gifbuild.1.gz

Return to bug 241777

Lines 1-4 Link Here

(-)./files/patch-Makefile (-4 / +15 lines)
1	--- Makefile.orig 2019-03-28 18:57:23 UTC	1	--- Makefile.orig 2019-06-24 16:08:57 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -8,7 +8,7 @@	3	@@ -8,7 +8,7 @@
4	#	4	#
Lines 23-29 Link Here
23	UHEADERS = getarg.h	23	UHEADERS = getarg.h
24	UOBJECTS = $(USOURCES:.c=.o)	24	UOBJECTS = $(USOURCES:.c=.o)
25		25
26	@@ -60,15 +60,21 @@ UTILS = $(INSTALLABLE) \	26	@@ -59,15 +59,21 @@ UTILS = $(INSTALLABLE) \
27	gifsponge \	27	gifsponge \
28	gifwedge	28	gifwedge
29		29
Lines 49-60 Link Here
49		49
50	libgif.a: $(OBJECTS) $(HEADERS)	50	libgif.a: $(OBJECTS) $(HEADERS)
51	$(AR) rcs libgif.a $(OBJECTS)	51	$(AR) rcs libgif.a $(OBJECTS)
52	@@ -100,7 +106,7 @@ install-include:	52	@@ -90,16 +96,16 @@ check: all
		53	# Installation/uninstallation
		54
		55	install: all install-bin install-include install-lib install-man
		56	-install-bin: $(INSTALLABLE)
		57	+install-bin: $(UTILS)
		58	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
		59	- $(INSTALL) $^ "$(DESTDIR)$(BINDIR)"
		60	+ $(INSTALL) -s $^ "$(DESTDIR)$(BINDIR)"
		61	install-include:
		62	$(INSTALL) -d "$(DESTDIR)$(INCDIR)"
		63	$(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)"
53	install-lib:	64	install-lib:
54	$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"	65	$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
55	$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"	66	$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
56	- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"	67	- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
57	+ $(INSTALL) -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"	68	+ $(INSTALL) -s -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
58	ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"	69	ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
59	ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"	70	ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
60	install-man:	71	install-man:

Lines 2-9 Link Here

(-)./Makefile (-6 / +1 lines)
2	# $FreeBSD: head/graphics/giflib/Makefile 503451 2019-06-04 08:23:41Z antoine $	2	# $FreeBSD: head/graphics/giflib/Makefile 503451 2019-06-04 08:23:41Z antoine $
3		3
4	PORTNAME= giflib	4	PORTNAME= giflib
5	PORTVERSION= 5.1.9	5	PORTVERSION= 5.2.1
6	PORTREVISION= 0
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF/${PORTNAME}	7	MASTER_SITES= SF/${PORTNAME}
9		8
Lines 27-34 do-install-DOCS-on: Link Here
27	${MKDIR} ${STAGEDIR}${DOCSDIR}	26	${MKDIR} ${STAGEDIR}${DOCSDIR}
28	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! ( -name Makefile -o -name \.1 -o -name \.in -o -name *\.xml )"	27	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! ( -name Makefile -o -name \.1 -o -name \.in -o -name *\.xml )"
29		28
30	post-install:
31	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
32	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.1.0
33
34	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)./pkg-plist (-1 / +5 lines)
1	bin/gif2rgb	1	bin/gif2rgb
		2	bin/gifbg
2	bin/gifbuild	3	bin/gifbuild
3	bin/gifclrmp	4	bin/gifclrmp
		5	bin/gifcolor
4	bin/gifecho	6	bin/gifecho
5	bin/giffilter	7	bin/giffilter
6	bin/giffix	8	bin/giffix
		9	bin/gifhisto
7	bin/gifinto	10	bin/gifinto
8	bin/gifsponge	11	bin/gifsponge
9	bin/giftext	12	bin/giftext
10	bin/giftool	13	bin/giftool
		14	bin/gifwedge
11	include/gif_lib.h	15	include/gif_lib.h
12	lib/libgif.a	16	lib/libgif.a
13	lib/libgif.so	17	lib/libgif.so
14	lib/libgif.so.7	18	lib/libgif.so.7
15	lib/libgif.so.7.1.0	19	lib/libgif.so.7.2.0
16	man/man1/gif2rgb.1.gz	20	man/man1/gif2rgb.1.gz
17	man/man1/gifbg.1.gz	21	man/man1/gifbg.1.gz
18	man/man1/gifbuild.1.gz	22	man/man1/gifbuild.1.gz