summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-02-06 10:36:38 +0000
committerjmmv <jmmv@pkgsrc.org>2003-02-06 10:36:38 +0000
commit10a038e77435c1ac593d5d2674fc601f10a275fc (patch)
tree9bcc57416b2bdac8064e7a2438e558aa60b21b0e
parent2ed8fd129205d0d2193f5731651853bc7a7f499c (diff)
downloadpkgsrc-10a038e77435c1ac593d5d2674fc601f10a275fc.tar.gz
Use install -c instead of just install.
Mark unreal targets in Makefile.prog as .PHONY... let's see if this solves the problem shown in bulk build.
-rw-r--r--textproc/sp/distinfo5
-rw-r--r--textproc/sp/patches/patch-aa4
-rw-r--r--textproc/sp/patches/patch-ab21
3 files changed, 26 insertions, 4 deletions
diff --git a/textproc/sp/distinfo b/textproc/sp/distinfo
index 7c77d8fc757..9979f8be78f 100644
--- a/textproc/sp/distinfo
+++ b/textproc/sp/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2003/01/29 21:43:34 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/02/06 10:36:38 jmmv Exp $
SHA1 (sp-1.3.4.tar.gz) = e71e96356b4bba269d01b6761d4ae33b4f291377
Size (sp-1.3.4.tar.gz) = 597801 bytes
-SHA1 (patch-aa) = 006734b5612abfa5c909bc721b6ffb6de1ca6734
+SHA1 (patch-aa) = 8d3b4380b96091d26e263cc5ddfaed0f5d746ebb
+SHA1 (patch-ab) = 10b93c822b7a14d3384a1247b03db40198733c19
SHA1 (patch-ac) = 012f14a4640db95a1d3708682de04d0d18fae97e
SHA1 (patch-ad) = 4a8f06ac288cf22616825fbcbed2e047fd6bcf5a
diff --git a/textproc/sp/patches/patch-aa b/textproc/sp/patches/patch-aa
index 0f8d5507898..c5b48d8c811 100644
--- a/textproc/sp/patches/patch-aa
+++ b/textproc/sp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2003/01/29 21:43:35 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2003/02/06 10:36:38 jmmv Exp $
--- Makefile.orig Sat Oct 10 06:15:02 1998
+++ Makefile Thu Dec 16 22:42:56 1999
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2003/01/29 21:43:35 jmmv Exp $
# Where to install the binaries
bindir=$(exec_prefix)/bin
-INSTALL=cp
-+INSTALL=${BSD_INSTALL}
++INSTALL=${BSD_INSTALL} -c
# You might want to uncomment this on BSD systems
#INSTALL=install
diff --git a/textproc/sp/patches/patch-ab b/textproc/sp/patches/patch-ab
new file mode 100644
index 00000000000..69a6810d481
--- /dev/null
+++ b/textproc/sp/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.3 2003/02/06 10:36:39 jmmv Exp $
+
+--- Makefile.prog.orig Sat Jul 6 23:55:41 1996
++++ Makefile.prog
+@@ -1,5 +1,7 @@
+ CLEANFILES=$(PROG)$(EXE) $(OBJS) core
+
++.PHONY: all pure install
++
+ all: $(PROG)$(EXE)
+
+ pure: $(PROG).pure
+@@ -10,7 +12,7 @@ $(PROG)$(EXE): $(OBJS) $(COBJS) $(XLIBS)
+ $(PROG).pure: $(OBJS) $(COBJS) $(XLIBS)
+ $(PURIFY) $(CXX) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(XLIBS) $(LIBS)
+
+-install: $(PROG)$(EXE)
++install! $(PROG)$(EXE)
+ -test -d $(bindir) || mkdir $(bindir)
+ -rm -f $(bindir)/$(PROG)$(EXE)
+ $(INSTALL) $(PROG)$(EXE) $(bindir)/$(PROG)$(EXE)