[pkgsrc/trunk]: pkgsrc/multimedia/xvidcore This wants to use INSTALL (which h...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ff57526b142
branches:  trunk
changeset: 471503:1ff57526b142
user:      snj <snj%pkgsrc.org@localhost>
date:      Sun Mar 28 23:09:51 2004 +0000

description:
This wants to use INSTALL (which has "-o root -g wheel" passed to it) in
places that it doesn't need to.  Adjust to more appropriate and more
friendly commands (MKDIR and BSD_INSTALL) so that this builds as non-root.

diffstat:

 multimedia/xvidcore/Makefile         |   4 ++-
 multimedia/xvidcore/distinfo         |   3 +-
 multimedia/xvidcore/patches/patch-aa |  40 ++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r 54cd33d24d4c -r 1ff57526b142 multimedia/xvidcore/Makefile
--- a/multimedia/xvidcore/Makefile      Sun Mar 28 22:30:38 2004 +0000
+++ b/multimedia/xvidcore/Makefile      Sun Mar 28 23:09:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/28 20:01:13 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/28 23:09:51 snj Exp $
 #
 
 DISTNAME=      xvidcore-1.0.0-rc3
@@ -17,4 +17,6 @@
 USE_BUILDLINK3=        YES
 GNU_CONFIGURE= YES
 
+MAKE_ENV+=     MKDIR="${MKDIR}"
+
 .include "../../mk/bsd.pkg.mk"
diff -r 54cd33d24d4c -r 1ff57526b142 multimedia/xvidcore/distinfo
--- a/multimedia/xvidcore/distinfo      Sun Mar 28 22:30:38 2004 +0000
+++ b/multimedia/xvidcore/distinfo      Sun Mar 28 23:09:51 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/03/28 20:01:13 mycroft Exp $
+$NetBSD: distinfo,v 1.3 2004/03/28 23:09:51 snj Exp $
 
 SHA1 (xvidcore-1.0.0-rc3.tar.bz2) = 09f8615fd9d03199b02c115130407f4baa3616c7
 Size (xvidcore-1.0.0-rc3.tar.bz2) = 532445 bytes
+SHA1 (patch-aa) = 26e24daa64916e5b2428b6788e05aba1a89301c2
diff -r 54cd33d24d4c -r 1ff57526b142 multimedia/xvidcore/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xvidcore/patches/patch-aa      Sun Mar 28 23:09:51 2004 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2004/03/28 23:09:51 snj Exp $
+
+--- Makefile.orig      2004-02-29 05:25:11.000000000 -0800
++++ Makefile   2004-03-28 14:32:24.000000000 -0800
+@@ -81,7 +81,7 @@ $(OBJECTS): platform.inc
+ 
+ $(BUILD_DIR):
+       @echo "  D: $(BUILD_DIR)"
+-      @$(INSTALL) -d $(BUILD_DIR)
++      @$(MKDIR) $(BUILD_DIR)
+ 
+ #-----------------------------------------------------------------------------
+ # Generic assembly rule
+@@ -89,7 +89,7 @@ $(BUILD_DIR):
+ 
+ .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
+       @echo "  A: $(@D)/$(<F)"
+-      @$(INSTALL) -d $(BUILD_DIR)/$(@D)
++      @$(MKDIR) $(BUILD_DIR)/$(@D)
+       @$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
+ 
+ #-----------------------------------------------------------------------------
+@@ -98,7 +98,7 @@ $(BUILD_DIR):
+ 
+ .c.$(OBJECT_EXTENSION):
+       @echo "  C: $(@D)/$(<F)"
+-      @$(INSTALL) -d $(BUILD_DIR)/$(@D)
++      @$(MKDIR) $(BUILD_DIR)/$(@D)
+       @$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
+ 
+ #-----------------------------------------------------------------------------
+@@ -126,7 +126,7 @@ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
+ 
+ $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
+       @echo "  L: $(@F)"
+-      @$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
++      @$(BSD_INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
+       @cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
+ 
+ #-----------------------------------------------------------------------------