diff options
| author | briggs <briggs> | 2002-04-17 18:58:51 +0000 |
|---|---|---|
| committer | briggs <briggs> | 2002-04-17 18:58:51 +0000 |
| commit | 36672d57f6e577ee7c74bc11bb2b42f0af75b687 (patch) | |
| tree | 78e480bdc54abaa08d94c65a55184def84eee938 | |
| parent | 154577eb27c33452c285bb818be927f45d6e8560 (diff) | |
| download | pkgsrc-36672d57f6e577ee7c74bc11bb2b42f0af75b687.tar.gz | |
Remove redefinition of X11PREFIX and use X11PREFIX for location of forms
and X11BASE as (gasp) location of X11. This helps installation with
xpkgwedge. Resolves, along with bsd.pkg.mk update, my own PR pkg/16350.
| -rw-r--r-- | comms/xisp/distinfo | 4 | ||||
| -rw-r--r-- | comms/xisp/patches/patch-aa | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo index cb68e7f4eb1..ad1b81b87da 100644 --- a/comms/xisp/distinfo +++ b/comms/xisp/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/04/17 04:45:09 fredb Exp $ +$NetBSD: distinfo,v 1.4 2002/04/17 18:58:51 briggs Exp $ SHA1 (xisp-2.6p1.tar.gz) = 5e6f1795f20b22fd26212215b86b505e00d43b9e Size (xisp-2.6p1.tar.gz) = 260645 bytes -SHA1 (patch-aa) = df706174b5f90d0f0543bf8c6e0027aee249c37e +SHA1 (patch-aa) = 7bbf49bbb32d5d57c9e1185dd03e16ca2f14fdf6 diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa index 9c71a0f5731..d8de2e8141e 100644 --- a/comms/xisp/patches/patch-aa +++ b/comms/xisp/patches/patch-aa @@ -1,18 +1,20 @@ -$NetBSD: patch-aa,v 1.5 2002/04/17 04:45:09 fredb Exp $ +$NetBSD: patch-aa,v 1.6 2002/04/17 18:58:52 briggs Exp $ ---- Makefile.orig Thu Aug 26 07:08:51 1999 -+++ Makefile +--- Makefile.orig Thu Aug 26 08:08:51 1999 ++++ Makefile Wed Apr 17 14:55:31 2002 @@ -8,11 +8,11 @@ # Compilation/installation vars (global for all following sections) | #===================================================================== # -PREFIX = /usr/local -X11PREFIX = /usr/X11R6 -+#PREFIX = /usr/local -+X11PREFIX = ${X11BASE} - INCX11 = $(X11PREFIX)/include - LIBX11 = $(X11PREFIX)/lib +-INCX11 = $(X11PREFIX)/include +-LIBX11 = $(X11PREFIX)/lib -INCFORMS = $(X11PREFIX)/include ++#PREFIX = /usr/local ++#X11PREFIX = /usr/X11R6 ++INCX11 = $(X11BASE)/include ++LIBX11 = $(X11BASE)/lib +INCFORMS = $(X11PREFIX)/include/X11 LIBFORMS = $(X11PREFIX)/lib MODEM_DEV = modem |