summaryrefslogtreecommitdiff
path: root/misc/mmv
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-09-22 09:56:24 +0000
committerwiz <wiz@pkgsrc.org>2003-09-22 09:56:24 +0000
commitc5c9fba282773c1cb08ce49d1fbe5a5e63188377 (patch)
treedaf518698c96afab2357129984a1b77fb1702c61 /misc/mmv
parentddfff4c3be6298aaf68a6f5c773e95d013ff1516 (diff)
downloadpkgsrc-c5c9fba282773c1cb08ce49d1fbe5a5e63188377.tar.gz
Fix build on Solaris. From Jonathan Perkin in PR 22884.
Diffstat (limited to 'misc/mmv')
-rw-r--r--misc/mmv/Makefile12
-rw-r--r--misc/mmv/distinfo4
-rw-r--r--misc/mmv/patches/patch-aa25
3 files changed, 18 insertions, 23 deletions
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 7a457d9c463..d1ae0b1a747 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:49:30 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/22 09:56:24 wiz Exp $
#
DISTNAME= mmv_1.01b.orig
@@ -13,4 +13,14 @@ COMMENT= mmv is a program to move multiple files using wildcard patterns
ALL_TARGET= mmv
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CFLAGS+= -DIS_SYSV
+.endif
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/mmv ${PREFIX}/bin/mmv
+ ${INSTALL_MAN} ${WRKSRC}/mmv.1 ${PREFIX}/man/man1/mmv.1
+
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/mmv/distinfo b/misc/mmv/distinfo
index a8361c4fb48..fa005793570 100644
--- a/misc/mmv/distinfo
+++ b/misc/mmv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/08/16 10:16:17 abs Exp $
+$NetBSD: distinfo,v 1.3 2003/09/22 09:56:24 wiz Exp $
SHA1 (mmv_1.01b.orig.tar.gz) = 538a26b1d7e8b9bc286843e6aa2d8d959d8914bb
Size (mmv_1.01b.orig.tar.gz) = 25656 bytes
-SHA1 (patch-aa) = ca985e048ae9c56a0d38a9e1f035e6776c5ec877
+SHA1 (patch-aa) = eb97c23ee711b1650d4e36ba61258ee704fd6766
SHA1 (patch-ab) = 1fc216f9d3ea0747ce57498e9738c1182c8555ee
diff --git a/misc/mmv/patches/patch-aa b/misc/mmv/patches/patch-aa
index 04c6b9bd232..203eea17b58 100644
--- a/misc/mmv/patches/patch-aa
+++ b/misc/mmv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/08/16 10:16:18 abs Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/22 09:56:25 wiz Exp $
--- Makefile.orig Sat Nov 5 00:24:55 1994
-+++ Makefile
-@@ -1,16 +1,16 @@
++++ Makefile Mon Sep 22 10:32:39 2003
+@@ -1,11 +1,11 @@
# Possible defines in CONF:
# IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR
@@ -13,24 +13,9 @@ $NetBSD: patch-aa,v 1.2 2001/08/16 10:16:18 abs Exp $
-LDFLAGS =-s -N
+#CC =gcc -traditional
+#LD =$(CC)
-+CCFLAGS+= -DIS_BSD -DHAS_DIRENT -DHAS_RENAME
-+#CFLAGS =-O2 $(CONF)
++CFLAGS += -DHAS_DIRENT -DHAS_RENAME
++#CFLAGS =-O2 -m486 $(CONF)
+#LDFLAGS =-s -N
#IBIN =$(LOCAL)$(ARCH)/bin
#IMAN =$(LOCAL)$(ANY)/man
--IBIN=$(DESTDIR)/usr/bin/
--IMAN=$(DESTDIR)/usr/man/
-+IBIN=${PREFIX}/bin
-+IMAN=${PREFIX}/man
-
- mmv: mmv.o
-
-@@ -20,5 +20,5 @@
- install: $(DEST)$(IBIN)/mmv
- install: $(DEST)$(IMAN)/man1/mmv.1
-
--$(DEST)$(IBIN)/mmv: mmv; cp $? $@
--$(DEST)$(IMAN)/man1/mmv.1: mmv.1; cp $? $@
-+$(DEST)$(IBIN)/mmv: mmv; install -c $? $@
-+$(DEST)$(IMAN)/man1/mmv.1: mmv.1; install -c -m 0644 $? $@