kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make this work with and without xpkgwedge (or something like that).

Browse source 
This might fix the breakage observed in Hubert's latest bulk-build as well.
This commit is contained in:
jschauma 2003-08-01 13:44:51 +00:00
parent 044757aac6
commit eef984fce5
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x11/fspanel/Makefile
View file

@ -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"

4
x11/fspanel/distinfo
View file

@ -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

19
x11/fspanel/patches/patch-aa
View file

@ -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