diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-08-01 13:44:51 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-08-01 13:44:51 +0000 |
| commit | eef984fce5638cd3c94aaba99915e1c643bde4a5 (patch) | |
| tree | 9fdd8f3e0675147ece54616673b8e0ceb8854ac6 /x11 | |
| parent | 044757aac608371b0eed36d9e9b3cb530a3f6181 (diff) | |
| download | pkgsrc-eef984fce5638cd3c94aaba99915e1c643bde4a5.tar.gz | |
Make this work with and without xpkgwedge (or something like that).
This might fix the breakage observed in Hubert's latest bulk-build as well.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fspanel/Makefile | 4 | ||||
| -rw-r--r-- | x11/fspanel/distinfo | 4 | ||||
| -rw-r--r-- | x11/fspanel/patches/patch-aa | 19 |
3 files changed, 19 insertions, 8 deletions
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile index 3c47cacbeef..5a8f0e6fa43 100644 --- a/x11/fspanel/Makefile +++ b/x11/fspanel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/07/23 16:59:53 jschauma Exp $ +# $NetBSD: Makefile,v 1.2 2003/08/01 13:44:51 jschauma Exp $ # DISTNAME= fspanel-0.8beta1 @@ -19,6 +19,6 @@ CFLAGS+= -DHAVE_XPM -DXFT do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${PREFIX}/bin/ -.include "../../graphics/freetype2/buildlink2.mk" +.include "../../fonts/Xft2/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fspanel/distinfo b/x11/fspanel/distinfo index 192a4f28329..13f4362e632 100644 --- a/x11/fspanel/distinfo +++ b/x11/fspanel/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/23 16:59:53 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2003/08/01 13:44:51 jschauma Exp $ SHA1 (fspanel-0.8beta1.tar.gz) = 80225c1cd6984b458e487db3cbc04d8e3a4173d8 Size (fspanel-0.8beta1.tar.gz) = 9703 bytes -SHA1 (patch-aa) = 8c43f1dd29dc159bd3ed90e437dd0e5a7443fe20 +SHA1 (patch-aa) = de1923370525dd6b4a127ef12c1eae17557a7c35 diff --git a/x11/fspanel/patches/patch-aa b/x11/fspanel/patches/patch-aa index bc4307bc751..6590167b0b1 100644 --- a/x11/fspanel/patches/patch-aa +++ b/x11/fspanel/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/23 16:59:54 jschauma Exp $ +$NetBSD: patch-aa,v 1.2 2003/08/01 13:44:51 jschauma Exp $ --- configure.orig Sun Jun 23 01:13:01 2002 -+++ configure Wed Jul 23 11:19:21 2003 ++++ configure Sun Jul 27 18:06:40 2003 @@ -2,63 +2,6 @@ PROGNAME=fspanel @@ -66,8 +66,19 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/23 16:59:54 jschauma Exp $ echo -n "checking for Linux... " if test "`uname`" = "Linux"; then CFLAGS="$CFLAGS -DNOSTDLIB -nostdlib" -@@ -73,20 +16,12 @@ - echo CFLAGS="$CFLAGS" >> Makefile +@@ -67,26 +10,22 @@ + echo no + fi + ++echo -n "checking freetype2 flags... " ++FSCFLAGS=`freetype-config --cflags` ++echo "${FSCFLAGS}" ++ + echo -n "creating Makefile... " + + echo CC="$CC" > Makefile +-echo CFLAGS="$CFLAGS" >> Makefile ++echo CFLAGS="${FSCFLAGS} $CFLAGS" >> Makefile echo LDFLAGS="$LDFLAGS" >> Makefile echo PROGNAME="$PROGNAME" >> Makefile +echo LIBS="-lXpm -lXft" >> Makefile |