diff options
| author | obache <obache> | 2010-11-23 06:22:28 +0000 |
|---|---|---|
| committer | obache <obache> | 2010-11-23 06:22:28 +0000 |
| commit | 92f4e1977f9db2e51979a516515ec31cfadcd9a4 (patch) | |
| tree | c26a1b12c8a371eca22330fbcebe8cdf0d7b8fdd /graphics/fly | |
| parent | 00e2264b5b90402f21d0b6bcf203a41c57be6be0 (diff) | |
| download | pkgsrc-92f4e1977f9db2e51979a516515ec31cfadcd9a4.tar.gz | |
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.
Diffstat (limited to 'graphics/fly')
| -rw-r--r-- | graphics/fly/Makefile | 16 | ||||
| -rw-r--r-- | graphics/fly/distinfo | 4 | ||||
| -rw-r--r-- | graphics/fly/patches/patch-aa | 6 |
3 files changed, 11 insertions, 15 deletions
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index 6fcf116d69e..ed810045f1f 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:30 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2010/11/23 06:22:28 obache Exp $ DISTNAME= fly-1.6.5 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= graphics www MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/ @@ -21,12 +21,10 @@ REPLACE_PERL= examples/cgi-perl-example.pl \ INSTALLATION_DIRS= bin -pre-configure: - ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ - < ${WRKSRC}/examples/cgi-perl-example.pl \ - > ${WRKSRC}/examples/cgi-perl-example.pl.new - ${MV} ${WRKSRC}/examples/cgi-perl-example.pl.new \ - ${WRKSRC}/examples/cgi-perl-example.pl +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= pre-configure +SUBST_FILES.prefix= examples/cgi-perl-example.pl +SUBST_VARS.prefix= PREFIX do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fly ${DESTDIR}${PREFIX}/bin @@ -39,7 +37,5 @@ do-install: cd ${WRKSRC}/examples; ${INSTALL_DATA} * \ ${DESTDIR}${PREFIX}/share/examples/fly -.include "../../graphics/freetype-lib/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/fly/distinfo b/graphics/fly/distinfo index e984d3562eb..915438af3fd 100644 --- a/graphics/fly/distinfo +++ b/graphics/fly/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 08:45:05 agc Exp $ +$NetBSD: distinfo,v 1.6 2010/11/23 06:22:28 obache Exp $ SHA1 (fly-1.6.5.tar.gz) = 7a76046aedf84478d0670c2dbd2d05849cc0035e RMD160 (fly-1.6.5.tar.gz) = 77a14e28bbcadaac67e5e7a009d4d1142b22c268 Size (fly-1.6.5.tar.gz) = 127349 bytes -SHA1 (patch-aa) = ab57432c5b5ccf257c600da880e0024ec68f7457 +SHA1 (patch-aa) = b28513301c5a4009d629da2f3ebe5065b701fcc0 SHA1 (patch-ab) = 1076212f3e917c752ba6777e40df1399a7ff586c SHA1 (patch-ac) = cad03ab8edc67ded2ba51874af4ff436e2f526f9 SHA1 (patch-ad) = 98f984019d3c2bf2614d4ab06bd42816e5a4fded diff --git a/graphics/fly/patches/patch-aa b/graphics/fly/patches/patch-aa index 18d331aa19d..fbb02538a1f 100644 --- a/graphics/fly/patches/patch-aa +++ b/graphics/fly/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2003/06/23 10:39:51 adam Exp $ +$NetBSD: patch-aa,v 1.9 2010/11/23 06:22:29 obache Exp $ --- Makefile.orig Thu Jan 14 17:42:34 1999 +++ Makefile Sun Oct 31 00:18:17 1999 @@ -16,8 +16,8 @@ $NetBSD: patch-aa,v 1.8 2003/06/23 10:39:51 adam Exp $ +# CFLAGS = -O -I$(GD) +# #CFLAGS = -O -pedantic -Wall -I$(GD) +# LIBS = -L$(GD) -lgd -lm -+CFLAGS += ${CPPFLAGS} -+LIBS = ${LDFLAGS} -lgd -lpng -lz -lttf -lintl -lXpm -lX11 -ljpeg -lm ++CFLAGS += ${CPPFLAGS} `gdlib-config --cflags` ++LIBS = ${LDFLAGS} `gdlib-config --ldflags` -lgd `gdlib-config --libs` -all: gd fly +all: fly |