diff options
| author | jlam <jlam@pkgsrc.org> | 2000-09-13 22:19:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-09-13 22:19:59 +0000 |
| commit | bd085d1eebbee765f1eccf25c4a8478e4084755d (patch) | |
| tree | a1a387df19c3da43da74e73e308f8a80b8587707 | |
| parent | de2d056c6db546c10bdaf12dc636f3d16a43c142 (diff) | |
| download | pkgsrc-bd085d1eebbee765f1eccf25c4a8478e4084755d.tar.gz | |
* Remove useless pre-install target.
* Find xview-clients in olvm/olvwm when xpkgwedge is installed.
| -rw-r--r-- | x11/xview-clients/Makefile | 17 | ||||
| -rw-r--r-- | x11/xview-clients/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/xview-clients/patches/patch-af | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile index 09f659312de..5ec6f3353a9 100644 --- a/x11/xview-clients/Makefile +++ b/x11/xview-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/09/13 20:25:04 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2000/09/13 22:19:59 jlam Exp $ # $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp # @@ -19,12 +19,13 @@ USE_IMAKE= # defined XMKMF= ${X11PREFIX}/bin/xvmkmf -a post-patch: - @${MV} ${WRKSRC}/olwm/openwin-menu-programs ${WRKSRC}/foo - @${SED} -e 's@XXX11BASEXXX@${PREFIX}@g' < ${WRKSRC}/foo > \ - ${WRKSRC}/olwm/openwin-menu-programs - @${RM} -f ${WRKSRC}/foo - -pre-install: - @cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man + @cd ${WRKSRC}; \ + for file in olwm/openwin-menu-programs; do \ + ${MV} -f $${file} $${file}.tmp; \ + ${SED} -e "s,@PREFIX@,${PREFIX},g" \ + -e "s,@X11BASE@,${X11BASE},g" \ + < $${file}.tmp > $${file}; \ + ${RM} -f $${file}.tmp; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/x11/xview-clients/files/patch-sum b/x11/xview-clients/files/patch-sum index eaac64dcbce..f1b91226d38 100644 --- a/x11/xview-clients/files/patch-sum +++ b/x11/xview-clients/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.2 2000/06/16 14:16:51 pooka Exp $ +$NetBSD: patch-sum,v 1.3 2000/09/13 22:20:00 jlam Exp $ MD5 (patch-aa) = fb07ad6f6bf34aa068aabb02165ad023 MD5 (patch-ab) = 2a59404ad8da61ee6b77ed067eed0c0f MD5 (patch-ac) = 7be5a892f3ea0b0add09d0122a70af51 MD5 (patch-ad) = 04d01607d0f78c84bb11142f1f7fffcf MD5 (patch-ae) = b9137d851fbe04f50e757370b4b3b99f -MD5 (patch-af) = 9fa26e96bc1c4c75aa11dc14e0bc2737 +MD5 (patch-af) = 5acb2808f2ec6e4e727699e8345a4df4 diff --git a/x11/xview-clients/patches/patch-af b/x11/xview-clients/patches/patch-af index e55e39050b3..ff594c6cf91 100644 --- a/x11/xview-clients/patches/patch-af +++ b/x11/xview-clients/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1 2000/06/16 14:16:52 pooka Exp $ +$NetBSD: patch-af,v 1.2 2000/09/13 22:20:00 jlam Exp $ --- olwm/openwin-menu-programs.orig Tue Jun 29 07:12:07 1993 +++ olwm/openwin-menu-programs Fri Jun 16 15:32:37 2000 @@ -8,10 +8,10 @@ $NetBSD: patch-af,v 1.1 2000/06/16 14:16:52 pooka Exp $ -"Command Tool..." exec $OPENWINHOME/bin/cmdtool -"Clock..." exec $OPENWINHOME/bin/clock -+"Command Tool..." exec XXX11BASEXXX/bin/cmdtool -+"Xterm..." exec XXX11BASEXXX/bin/xterm ++"Command Tool..." exec @PREFIX@/bin/cmdtool ++"Xterm..." exec @X11BASE@/bin/xterm + +SEPARATOR + -+"Clock..." exec XXX11BASEXXX/bin/clock ++"Clock..." exec @PREFIX@/bin/clock + |