[pkgsrc/trunk]: pkgsrc/misc/mmv Fix build on Solaris. From Jonathan Perkin in...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/091ef0138d59
branches:  trunk
changeset: 461825:091ef0138d59
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Sep 22 09:56:24 2003 +0000

description:
Fix build on Solaris. From Jonathan Perkin in PR 22884.

diffstat:

 misc/mmv/Makefile         |  12 +++++++++++-
 misc/mmv/distinfo         |   4 ++--
 misc/mmv/patches/patch-aa |  25 +++++--------------------
 3 files changed, 18 insertions(+), 23 deletions(-)

diffs (78 lines):

diff -r 77c92d4b9187 -r 091ef0138d59 misc/mmv/Makefile
--- a/misc/mmv/Makefile Mon Sep 22 09:41:13 2003 +0000
+++ b/misc/mmv/Makefile Mon Sep 22 09:56:24 2003 +0000
@@ -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 @@
 
 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 -r 77c92d4b9187 -r 091ef0138d59 misc/mmv/distinfo
--- a/misc/mmv/distinfo Mon Sep 22 09:41:13 2003 +0000
+++ b/misc/mmv/distinfo Mon Sep 22 09:56:24 2003 +0000
@@ -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 -r 77c92d4b9187 -r 091ef0138d59 misc/mmv/patches/patch-aa
--- a/misc/mmv/patches/patch-aa Mon Sep 22 09:41:13 2003 +0000
+++ b/misc/mmv/patches/patch-aa Mon Sep 22 09:56:24 2003 +0000
@@ -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 @@
 -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 $? $@