Tue Nov 23 06:22:29 2010 UTC ()
Some improvements
* libfreetype support had been dropped in GD-2.x, no need to buildlink here.
* libXpm dependency is optionify in current graphics/gd, no need libdlink here.
* take CFLAGS and LIBS for libgd from gdlib-config.
* use SUBST for replacing PREFIX.

Bump PKGREVISION.


(obache)
diff -r1.37 -r1.38 pkgsrc/graphics/fly/Makefile
diff -r1.5 -r1.6 pkgsrc/graphics/fly/distinfo
diff -r1.8 -r1.9 pkgsrc/graphics/fly/patches/patch-aa
cvs diff -r1.37 -r1.38 pkgsrc/graphics/fly/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/fly/Makefile 2010/06/13 22:44:30 1.37
+++ pkgsrc/graphics/fly/Makefile 2010/11/23 06:22:28 1.38
@@ -1,45 +1,41 @@ @@ -1,45 +1,41 @@
1# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.38 2010/11/23 06:22:28 obache Exp $
2 2
3DISTNAME= fly-1.6.5 3DISTNAME= fly-1.6.5
4PKGREVISION= 11 4PKGREVISION= 12
5CATEGORIES= graphics www 5CATEGORIES= graphics www
6MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/ 6MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/
7 7
8MAINTAINER= bouyer@NetBSD.org 8MAINTAINER= bouyer@NetBSD.org
9HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html 9HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html
10COMMENT= Command-file interface for creating and modifying PNG images 10COMMENT= Command-file interface for creating and modifying PNG images
11 11
12BUILD_DEPENDS+= gif2png>=2.4.2:../../graphics/gif2png 12BUILD_DEPENDS+= gif2png>=2.4.2:../../graphics/gif2png
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= perl:run 16USE_TOOLS+= perl:run
17REPLACE_PERL= examples/cgi-perl-example.pl \ 17REPLACE_PERL= examples/cgi-perl-example.pl \
18 examples/fly-tester.pl \ 18 examples/fly-tester.pl \
19 examples/size.pl \ 19 examples/size.pl \
20 examples/perl.example 20 examples/perl.example
21 21
22INSTALLATION_DIRS= bin 22INSTALLATION_DIRS= bin
23 23
24pre-configure: 24SUBST_CLASSES+= prefix
25 ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ 25SUBST_STAGE.prefix= pre-configure
26 < ${WRKSRC}/examples/cgi-perl-example.pl \ 26SUBST_FILES.prefix= examples/cgi-perl-example.pl
27 > ${WRKSRC}/examples/cgi-perl-example.pl.new 27SUBST_VARS.prefix= PREFIX
28 ${MV} ${WRKSRC}/examples/cgi-perl-example.pl.new \ 
29 ${WRKSRC}/examples/cgi-perl-example.pl 
30 28
31do-install: 29do-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/fly ${DESTDIR}${PREFIX}/bin 30 ${INSTALL_PROGRAM} ${WRKSRC}/fly ${DESTDIR}${PREFIX}/bin
33 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fly 31 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fly
34 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fly 32 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fly
35 cd ${WRKSRC}/doc; ${LOCALBASE}/bin/gif2png *.gif 33 cd ${WRKSRC}/doc; ${LOCALBASE}/bin/gif2png *.gif
36 cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png \ 34 cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png \
37 ${DESTDIR}${PREFIX}/share/doc/fly 35 ${DESTDIR}${PREFIX}/share/doc/fly
38 ${RM} -f ${WRKSRC}/examples/*.orig 36 ${RM} -f ${WRKSRC}/examples/*.orig
39 cd ${WRKSRC}/examples; ${INSTALL_DATA} * \ 37 cd ${WRKSRC}/examples; ${INSTALL_DATA} * \
40 ${DESTDIR}${PREFIX}/share/examples/fly 38 ${DESTDIR}${PREFIX}/share/examples/fly
41 39
42.include "../../graphics/freetype-lib/buildlink3.mk" 
43.include "../../graphics/gd/buildlink3.mk" 40.include "../../graphics/gd/buildlink3.mk"
44.include "../../x11/libXpm/buildlink3.mk" 
45.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/graphics/fly/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/fly/distinfo 2005/02/24 08:45:05 1.5
+++ pkgsrc/graphics/fly/distinfo 2010/11/23 06:22:28 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.5 2005/02/24 08:45:05 agc Exp $ 1$NetBSD: distinfo,v 1.6 2010/11/23 06:22:28 obache Exp $
2 2
3SHA1 (fly-1.6.5.tar.gz) = 7a76046aedf84478d0670c2dbd2d05849cc0035e 3SHA1 (fly-1.6.5.tar.gz) = 7a76046aedf84478d0670c2dbd2d05849cc0035e
4RMD160 (fly-1.6.5.tar.gz) = 77a14e28bbcadaac67e5e7a009d4d1142b22c268 4RMD160 (fly-1.6.5.tar.gz) = 77a14e28bbcadaac67e5e7a009d4d1142b22c268
5Size (fly-1.6.5.tar.gz) = 127349 bytes 5Size (fly-1.6.5.tar.gz) = 127349 bytes
6SHA1 (patch-aa) = ab57432c5b5ccf257c600da880e0024ec68f7457 6SHA1 (patch-aa) = b28513301c5a4009d629da2f3ebe5065b701fcc0
7SHA1 (patch-ab) = 1076212f3e917c752ba6777e40df1399a7ff586c 7SHA1 (patch-ab) = 1076212f3e917c752ba6777e40df1399a7ff586c
8SHA1 (patch-ac) = cad03ab8edc67ded2ba51874af4ff436e2f526f9 8SHA1 (patch-ac) = cad03ab8edc67ded2ba51874af4ff436e2f526f9
9SHA1 (patch-ad) = 98f984019d3c2bf2614d4ab06bd42816e5a4fded 9SHA1 (patch-ad) = 98f984019d3c2bf2614d4ab06bd42816e5a4fded
10SHA1 (patch-ae) = 3ec7003ba9bbb9bdbdfae7f2c47c068a5ea6b4c4 10SHA1 (patch-ae) = 3ec7003ba9bbb9bdbdfae7f2c47c068a5ea6b4c4
11SHA1 (patch-af) = 3677f95a112c49e6d7a533ffb5ac9931f6c5fd3e 11SHA1 (patch-af) = 3677f95a112c49e6d7a533ffb5ac9931f6c5fd3e
12SHA1 (patch-ag) = b8513ef6906436f3496ee0f56e0a548e44195ccc 12SHA1 (patch-ag) = b8513ef6906436f3496ee0f56e0a548e44195ccc
13SHA1 (patch-ah) = 05d70c8772a707111f4eae9f42508578e295698a 13SHA1 (patch-ah) = 05d70c8772a707111f4eae9f42508578e295698a
14SHA1 (patch-ai) = 8dcc18ede42d15621b59feedf577e1932e3420b5 14SHA1 (patch-ai) = 8dcc18ede42d15621b59feedf577e1932e3420b5
15SHA1 (patch-aj) = 194d9489ad3fef13890d1ad354f2e1c05fb681cb 15SHA1 (patch-aj) = 194d9489ad3fef13890d1ad354f2e1c05fb681cb
16SHA1 (patch-ak) = 83be459b1ddef75f8c829084ae8071a7c5b345de 16SHA1 (patch-ak) = 83be459b1ddef75f8c829084ae8071a7c5b345de
17SHA1 (patch-al) = 3f720d2ab45169cd6e2aa3904e84bbd6210abb19 17SHA1 (patch-al) = 3f720d2ab45169cd6e2aa3904e84bbd6210abb19
18SHA1 (patch-am) = beb38d8609fb015fa4d786d2b688adba20a9d75e 18SHA1 (patch-am) = beb38d8609fb015fa4d786d2b688adba20a9d75e
19SHA1 (patch-an) = a2e84081e1e11a779cdd67f62cb88db689c7e317 19SHA1 (patch-an) = a2e84081e1e11a779cdd67f62cb88db689c7e317
cvs diff -r1.8 -r1.9 pkgsrc/graphics/fly/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/fly/patches/patch-aa 2003/06/23 10:39:51 1.8
+++ pkgsrc/graphics/fly/patches/patch-aa 2010/11/23 06:22:29 1.9
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-aa,v 1.8 2003/06/23 10:39:51 adam Exp $ 1$NetBSD: patch-aa,v 1.9 2010/11/23 06:22:29 obache Exp $
2 2
3--- Makefile.orig Thu Jan 14 17:42:34 1999 3--- Makefile.orig Thu Jan 14 17:42:34 1999
4+++ Makefile Sun Oct 31 00:18:17 1999 4+++ Makefile Sun Oct 31 00:18:17 1999
5@@ -4,13 +4,15 @@ 5@@ -4,13 +4,15 @@
6 # If you already have gd installed, use the line below and comment out the 6 # If you already have gd installed, use the line below and comment out the
7 # following line 7 # following line
8 # GD = /path/to/gd/directory 8 # GD = /path/to/gd/directory
9- GD = gd1.3 9- GD = gd1.3
10- CC = gcc 10- CC = gcc
11- CFLAGS = -O -I$(GD) 11- CFLAGS = -O -I$(GD)
12- #CFLAGS = -O -pedantic -Wall -I$(GD) 12- #CFLAGS = -O -pedantic -Wall -I$(GD)
13- LIBS = -L$(GD) -lgd -lm 13- LIBS = -L$(GD) -lgd -lm
14+# GD = gd1.3 14+# GD = gd1.3
15+# CC = gcc 15+# CC = gcc
16+# CFLAGS = -O -I$(GD) 16+# CFLAGS = -O -I$(GD)
17+# #CFLAGS = -O -pedantic -Wall -I$(GD) 17+# #CFLAGS = -O -pedantic -Wall -I$(GD)
18+# LIBS = -L$(GD) -lgd -lm 18+# LIBS = -L$(GD) -lgd -lm
19+CFLAGS += ${CPPFLAGS} 19+CFLAGS += ${CPPFLAGS} `gdlib-config --cflags`
20+LIBS = ${LDFLAGS} -lgd -lpng -lz -lttf -lintl -lXpm -lX11 -ljpeg -lm 20+LIBS = ${LDFLAGS} `gdlib-config --ldflags` -lgd `gdlib-config --libs`
21  21
22-all: gd fly 22-all: gd fly
23+all: fly 23+all: fly
24  24
25 gd: $(GD) 25 gd: $(GD)
26 cd $(GD); make CC=$(CC) 26 cd $(GD); make CC=$(CC)
27@@ -27,4 +29,3 @@ 27@@ -27,4 +29,3 @@
28  28
29 clean: 29 clean:
30 rm -f fly.o fly temp.gif core; cd $(GD); make clean; 30 rm -f fly.o fly temp.gif core; cd $(GD); make clean;
31- 31-