diff options
| author | agc <agc> | 2000-07-11 09:53:10 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-11 09:53:10 +0000 |
| commit | 8c4ff2ecd0a8c91f83b60e76845bd78ba320cecc (patch) | |
| tree | da6bc0800a0f2dd3a213b33fc9c13d9ae1f4277e /mail/faces | |
| parent | 92bb2287afc9772a728feb3ac2e8e0993ef54480 (diff) | |
| download | pkgsrc-8c4ff2ecd0a8c91f83b60e76845bd78ba320cecc.tar.gz | |
Attempt to differentiate between X11BASE (where X11 is installed) and
X11PREFIX (where the app defaults file is to be installed, and which
will be X11BASE, or LOCALBASE if xpkgwedge is installed).
Diffstat (limited to 'mail/faces')
| -rw-r--r-- | mail/faces/Makefile | 5 | ||||
| -rw-r--r-- | mail/faces/files/patch-sum | 4 | ||||
| -rw-r--r-- | mail/faces/patches/patch-ab | 6 | ||||
| -rw-r--r-- | mail/faces/pkg/PLIST | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/mail/faces/Makefile b/mail/faces/Makefile index ae7c3ec8cd1..0f4be79895a 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/07/08 12:47:02 tron Exp $ +# $NetBSD: Makefile,v 1.16 2000/07/11 09:53:10 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp # @@ -22,6 +22,7 @@ post-configure: scripts/mkfacesindex; do \ ${MV} $$f $$f.in; \ ${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \ + -e 's|@x11prefix@|'${X11PREFIX}'|g' \ -e 's|@x11base@|'${X11BASE}'|g' < $$f.in > $$f; \ done @@ -31,7 +32,7 @@ post-install: ${LN} -f ${PREFIX}/man/man1/compface.1 ${PREFIX}/man/man1/uncompface.1 ${LN} -f ${PREFIX}/man/man3/compface.3 ${PREFIX}/man/man3/uncompface.3 @${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \ - -e 's|@x11base@|'${X11BASE}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC} + -e 's|@x11prefix@|'${X11PREFIX}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC} .include "../../mk/bsd.prefs.mk" diff --git a/mail/faces/files/patch-sum b/mail/faces/files/patch-sum index 3b869bb5f1c..d43d4a26f59 100644 --- a/mail/faces/files/patch-sum +++ b/mail/faces/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.5 2000/07/08 12:47:04 tron Exp $ +$NetBSD: patch-sum,v 1.6 2000/07/11 09:53:11 agc Exp $ MD5 (patch-aa) = 052e47d7ef63e511fcd5d2d1cc306ba1 -MD5 (patch-ab) = a06f919cdbc0400653139d2978fb1445 +MD5 (patch-ab) = 76829626220cdec02f5bd190062f8b43 MD5 (patch-ac) = 36f893a6e4d333e2b0bde29078ffa755 MD5 (patch-ad) = 8c46ea454eaf308aaa2940b051974dfd MD5 (patch-ae) = f56893cac29f4610d535974407a47fa5 diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab index 3a467a20051..66404355750 100644 --- a/mail/faces/patches/patch-ab +++ b/mail/faces/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2000/07/08 12:47:04 tron Exp $ +$NetBSD: patch-ab,v 1.7 2000/07/11 09:53:11 agc Exp $ --- Makefile.orig Sat Jul 8 14:25:27 2000 +++ Makefile Sat Jul 8 14:28:16 2000 @@ -363,7 +363,7 @@ $NetBSD: patch-ab,v 1.6 2000/07/08 12:47:04 tron Exp $ +# Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet +# AT&T's XWIN: $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt +# -+X11LIBS = -L/usr/X11R6/lib -lX11 ++X11LIBS = -L@x11base@/lib -lX11 +XVIEWLIBS = $(XVIEWLIBDIR) -lxview -lolgx -lX11 + +help: @@ -428,7 +428,7 @@ $NetBSD: patch-ab,v 1.6 2000/07/08 12:47:04 tron Exp $ + $(MANDIR)/man$(MANSECT)/faces.$(MANSECT) + install -c -m 444 face_update.1 \ + $(MANDIR)/man$(MANSECT)/face_update.$(MANSECT) -+ install -c -m 444 -o bin Faces.ad /usr/X11R6/lib/X11/app-defaults/Faces ++ install -c -m 444 -o bin Faces.ad @x11prefix@/lib/X11/app-defaults/Faces + +clean: + (cd compface; $(MAKE) $(MAKEOPTS) clean) diff --git a/mail/faces/pkg/PLIST b/mail/faces/pkg/PLIST index b7acb9d7339..df48e45d692 100644 --- a/mail/faces/pkg/PLIST +++ b/mail/faces/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 1998/07/15 12:17:02 agc Exp $ +@comment $NetBSD: PLIST,v 1.7 2000/07/11 09:53:11 agc Exp $ @cwd @localbase@ share/faces/machine.tab share/faces/people.tab @@ -36,5 +36,5 @@ bin/face_update bin/faces.sendmail man/man1/faces.1.gz man/man1/face_update.1.gz -@cwd @x11base@ +@cwd @x11prefix@ lib/X11/app-defaults/Faces |