diff options
| -rw-r--r-- | mbone/imm/Makefile | 3 | ||||
| -rw-r--r-- | mbone/imm/patches/patch-ad | 11 | ||||
| -rw-r--r-- | shells/scsh/Makefile | 9 | ||||
| -rw-r--r-- | shells/scsh/patches/patch-aa | 88 | ||||
| -rw-r--r-- | shells/scsh/pkg/PLIST | 4 | ||||
| -rw-r--r-- | x11/windowmaker/Makefile | 13 | ||||
| -rw-r--r-- | x11/windowmaker/patches/patch-ac | 13 |
7 files changed, 90 insertions, 51 deletions
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile index b809b240652..c0171759d1d 100644 --- a/mbone/imm/Makefile +++ b/mbone/imm/Makefile @@ -3,7 +3,7 @@ # Date created: 1997/11/24 # Whom: is # -# $NetBSD: Makefile,v 1.5 1998/01/30 13:57:59 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/02/09 00:09:25 hubertf Exp $ # # NetBSD "imm" package # The original was based on the imm-3.5a1 FreeBSD port maintained @@ -21,5 +21,6 @@ MAINTAINER= is@netbsd.org LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 ALL_TARGET= netbsd +MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" .include <bsd.port.mk> diff --git a/mbone/imm/patches/patch-ad b/mbone/imm/patches/patch-ad index e2a84a7aa87..54d2f527d7d 100644 --- a/mbone/imm/patches/patch-ad +++ b/mbone/imm/patches/patch-ad @@ -1,5 +1,5 @@ --- Makefile.orig Mon Feb 10 16:56:48 1997 -+++ Makefile Mon Nov 24 15:19:47 1997 ++++ Makefile Sun Feb 8 12:17:31 1998 @@ -1,9 +1,9 @@ ################################## # Common Area @@ -26,3 +26,12 @@ all linux: +@@ -61,7 +61,7 @@ + + ############## + # common defines +-INSTALL=cp ++INSTALL=${INSTALL_PROGRAM} + VERSION=36a1 + EXECS=imm immserv mnm mdpsniff + diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile index 6d2c6e2daab..478f296dc52 100644 --- a/shells/scsh/Makefile +++ b/shells/scsh/Makefile @@ -3,7 +3,7 @@ # Date created: Jul, 15, 1997 # Whom: cracauer@cons.org "Martin Cracauer" # -# $NetBSD: Makefile,v 1.1.1.1 1997/10/27 04:53:28 hubertf Exp $ +# $NetBSD: Makefile,v 1.2 1998/02/09 00:16:04 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp # @@ -17,7 +17,12 @@ GNU_CONFIGURE= yes ALL_TARGET= enough MAN1= scsh.1 -STRIP= +MAKE_ENV+= INSTALL_PROGRAM='${INSTALL_PROGRAM}' \ + INSTALL_SCRIPT='${INSTALL_SCRIPT}' \ + INSTALL_DATA='${INSTALL_DATA}' + +post-configure: + cd ${WRKSRC};sed -e '/LIBGEN/s@^@/*@g' -e '/LIBGEN/s@$$@*/@g' sysdep.h >xx ; mv xx sysdep.h post-install: @strip ${PREFIX}/bin/scsh diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa index 22f97bee64e..3cea328180d 100644 --- a/shells/scsh/patches/patch-aa +++ b/shells/scsh/patches/patch-aa @@ -1,39 +1,49 @@ -*** Makefile.in.original Tue Nov 26 14:44:19 1996 ---- Makefile.in Thu Nov 28 15:29:24 1996 -*************** -*** 137,143 **** - - # The following is the first rule and therefore the "make" command's - # default target. -! enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) .notify - - # The developers are curious to know. Don't be concerned if this fails. - # You may comment these lines out if you wish to be discourteous. ---- 137,143 ---- - - # The following is the first rule and therefore the "make" command's - # default target. -! enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) - - # The developers are curious to know. Don't be concerned if this fails. - # You may comment these lines out if you wish to be discourteous. -*************** -*** 250,255 **** ---- 250,256 ---- - $(RM) -r $(LIB).old - if [ -d $(LIB) ] ; then mv $(LIB) $(LIB).old ; fi - mkdir $(LIB) -+ mkdir $(LIB)/emacs - mkdir $(LIB)/big - mkdir $(LIB)/cig - mkdir $(LIB)/doc -*************** -*** 286,291 **** ---- 287,293 ---- - $(LIB)/misc $(LIB)/link $(LIB)/vm $(LIB)/doc - for f in $(srcdir)/rts/*num.scm; \ - do $(INSTALL_DATA) $$f $(LIB)/rts/; done -+ for f in $(srcdir)/emacs/*; do $(INSTALL_DATA) $$f $(LIB)/emacs/; done - for f in $(srcdir)/env/*.scm; do $(INSTALL_DATA) $$f $(LIB)/env/; done - for f in $(srcdir)/big/*.scm; do $(INSTALL_DATA) $$f $(LIB)/big/; done - for f in $(srcdir)/opt/*.scm; do $(INSTALL_DATA) $$f $(LIB)/opt/; done +--- Makefile.in.orig Mon Jun 9 03:46:05 1997 ++++ Makefile.in Sat Feb 7 22:31:02 1998 +@@ -139,7 +139,7 @@ + + # The following is the first rule and therefore the "make" command's + # default target. +-enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) .notify ++enough: $(VM) $(IMAGE) script $(LIBCIG) scsh $(LIBSCSH) $(MANPAGE) + + # The developers are curious to know. Don't be concerned if this fails. + # You may comment these lines out if you wish to be discourteous. +@@ -252,6 +252,7 @@ + $(RM) -r $(LIB).old + if [ -d $(LIB) ] ; then mv $(LIB) $(LIB).old ; fi + mkdir $(LIB) ++ mkdir $(LIB)/emacs + mkdir $(LIB)/big + mkdir $(LIB)/cig + mkdir $(LIB)/doc +@@ -279,8 +280,8 @@ + $(INSTALL_DATA) $(srcdir)/scheme48.h $(incdir)/ + + install-cig: cig +- $(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(LIB)/cig +- $(INSTALL_PROGRAM) $(srcdir)/$(CIG).image $(LIB)/cig ++ $(INSTALL_SCRIPT) $(srcdir)/$(CIG) $(LIB)/cig ++ $(INSTALL_SCRIPT) $(srcdir)/$(CIG).image $(LIB)/cig + $(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(LIB)/cig + $(INSTALL_DATA) $(srcdir)/cig/libcig.h $(LIB)/cig + +@@ -288,6 +289,7 @@ + $(LIB)/misc $(LIB)/link $(LIB)/vm $(LIB)/doc + for f in $(srcdir)/rts/*num.scm; \ + do $(INSTALL_DATA) $$f $(LIB)/rts/; done ++ for f in $(srcdir)/emacs/*; do $(INSTALL_DATA) $$f $(LIB)/emacs/; done + for f in $(srcdir)/env/*.scm; do $(INSTALL_DATA) $$f $(LIB)/env/; done + for f in $(srcdir)/big/*.scm; do $(INSTALL_DATA) $$f $(LIB)/big/; done + for f in $(srcdir)/opt/*.scm; do $(INSTALL_DATA) $$f $(LIB)/opt/; done +@@ -676,8 +678,8 @@ + install-scsh: scsh + $(RM) $(bindir)/$(RUNNABLE) + $(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE) +- $(INSTALL_PROGRAM) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image +- $(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH) ++ $(INSTALL_SCRIPT) $(srcdir)/scsh/scsh.image $(LIB)/scsh.image ++ $(INSTALL_DATA) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH) + $(RANLIB) $(libdir)/$(LIBSCSH) + for f in $(srcdir)/scsh/*.scm; \ + do $(INSTALL_DATA) $$f $(LIB)/scsh/; done diff --git a/shells/scsh/pkg/PLIST b/shells/scsh/pkg/PLIST index 70270680091..8f533a5cfe7 100644 --- a/shells/scsh/pkg/PLIST +++ b/shells/scsh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:04:26 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1998/02/09 00:16:11 hubertf Exp $ bin/scsh man/man1/scsh.1.gz lib/scsh/big/array.scm @@ -238,4 +238,4 @@ lib/scsh/emacs/jar-hacks.el @dirrm lib/scsh/rts @dirrm lib/scsh/vm @dirrm lib/scsh -@unexec echo 'You might check whether to remove %D/lib/scsh.old' +@unexec [ -d %D/lib/scsh.old ] && rm -fr %D/lib/scsh.old diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index 4054d3c40f7..79f090c660d 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -4,7 +4,7 @@ # Whom: handy@physics.montana.edu (FreeBSD) # explorer@netbsd.org (NetBSD) # -# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:47 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/02/09 00:13:19 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/04 10:33:43 tg Exp # @@ -16,13 +16,14 @@ MASTER_SITES= http://isolation.ml.org/oxygen/wm/bin/ \ MAINTAINER= handy@physics.montana.edu -LIB_DEPENDS= Xpm.4.:${PORTSDIR}/graphics/xpm \ - png.0.:${PORTSDIR}/graphics/png \ - jpeg.7.:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \ + png\\.0\\.:${PORTSDIR}/graphics/png \ + jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg USE_X11= yes GNU_CONFIGURE= yes -STRIP= -CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include +#STRIP= +MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" +CONFIGURE_ARGS+= --includedir=${PREFIX}/include .include <bsd.port.mk> diff --git a/x11/windowmaker/patches/patch-ac b/x11/windowmaker/patches/patch-ac new file mode 100644 index 00000000000..2a0a6c1c2dc --- /dev/null +++ b/x11/windowmaker/patches/patch-ac @@ -0,0 +1,13 @@ +--- util/Makefile.in.orig Sat Feb 7 21:40:49 1998 ++++ util/Makefile.in Sat Feb 7 21:46:53 1998 +@@ -78,8 +78,8 @@ + $(INSTALL_BIN) -s savews $(bindir) + $(INSTALL_BIN) -s wxcopy $(bindir) + $(INSTALL_BIN) -s wxpaste $(bindir) +- $(INSTALL_BIN) dockapp $(bindir) +- $(INSTALL_BIN) wmaker.inst $(bindir) ++ $(INSTALL_SCRIPT) dockapp $(bindir) ++ $(INSTALL_SCRIPT) wmaker.inst $(bindir) + + + clean: |