diff options
| author | agc <agc> | 2004-07-29 21:48:56 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-29 21:48:56 +0000 |
| commit | 2741052b7bdb4683126f1fa3b43ebb0ba9bf2d56 (patch) | |
| tree | d782f2995791dfd75c0b84a4e218186051b6fa80 | |
| parent | 8666c472fdd25411a54955c9e23e3c64c19d9b49 (diff) | |
| download | pkgsrc-2741052b7bdb4683126f1fa3b43ebb0ba9bf2d56.tar.gz | |
Pullup ticket 79 to the pkgsrc-2004Q2 branch, requested by Grant Beattie
Solaris fixes for fspanel
Module Name: pkgsrc
Committed By: grant
Date: Sat Jul 10 14:07:20 UTC 2004
Modified Files:
pkgsrc/x11/fspanel: Makefile distinfo
pkgsrc/x11/fspanel/patches: patch-aa
Log Message:
expose a hidden dependency on libX11, fixes build on Solaris.
and
Module Name: pkgsrc
Committed By: grant
Date: Sat Jul 10 14:07:44 UTC 2004
Modified Files:
pkgsrc/x11/fspanel: Makefile
Log Message:
remove line mistakenly committed
| -rw-r--r-- | doc/CHANGES-pkgsrc-2004Q2 | 4 | ||||
| -rw-r--r-- | x11/fspanel/distinfo | 4 | ||||
| -rw-r--r-- | x11/fspanel/patches/patch-aa | 14 |
3 files changed, 12 insertions, 10 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index e28289c2982..111ef5240ce 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.42 2004/07/29 21:44:01 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.43 2004/07/29 21:48:56 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -80,4 +80,6 @@ Pullup ticket 77, requested by Grant Beattie [agc 2004-07-29] build fix for tcpdstat Pullup ticket 78, requested by Grant Beattie [agc 2004-07-29] follow pkgsrc conventions for including bsd.pkg.mk +Pullup ticket 79, requested by Grant Beattie [agc 2004-07-29] + Solaris fixes for fspanel diff --git a/x11/fspanel/distinfo b/x11/fspanel/distinfo index 13f4362e632..048f8498d22 100644 --- a/x11/fspanel/distinfo +++ b/x11/fspanel/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2003/08/01 13:44:51 jschauma Exp $ +$NetBSD: distinfo,v 1.2.6.1 2004/07/29 21:48:56 agc Exp $ SHA1 (fspanel-0.8beta1.tar.gz) = 80225c1cd6984b458e487db3cbc04d8e3a4173d8 Size (fspanel-0.8beta1.tar.gz) = 9703 bytes -SHA1 (patch-aa) = de1923370525dd6b4a127ef12c1eae17557a7c35 +SHA1 (patch-aa) = 8a61200ff8ef1c05b78ed4bb1a9150c52a95b5e5 diff --git a/x11/fspanel/patches/patch-aa b/x11/fspanel/patches/patch-aa index 6590167b0b1..45e0660e6a8 100644 --- a/x11/fspanel/patches/patch-aa +++ b/x11/fspanel/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2003/08/01 13:44:51 jschauma Exp $ +$NetBSD: patch-aa,v 1.2.6.1 2004/07/29 21:48:56 agc Exp $ ---- configure.orig Sun Jun 23 01:13:01 2002 -+++ configure Sun Jul 27 18:06:40 2003 -@@ -2,63 +2,6 @@ +--- configure.orig 2002-06-23 15:13:01.000000000 +1000 ++++ configure +@@ -2,62 +2,7 @@ PROGNAME=fspanel @@ -62,11 +62,11 @@ $NetBSD: patch-aa,v 1.2 2003/08/01 13:44:51 jschauma Exp $ -else - echo no -fi -- ++LDFLAGS="$LDFLAGS -lX11" + echo -n "checking for Linux... " if test "`uname`" = "Linux"; then - CFLAGS="$CFLAGS -DNOSTDLIB -nostdlib" -@@ -67,26 +10,22 @@ +@@ -67,26 +12,22 @@ else echo no fi |