Changeset 82799

Timestamp:

08/20/11 11:39:11 (4 years ago)

Author:

ryandesign@…

Message:

XviD: modify Makefile to accept "V=1" argument for verbose output; will submit this patch upstream

Location:

trunk/dports/multimedia/XviD

Files:

• Portfile (modified) (1 diff)
• files/patch-Makefile.diff (modified) (1 diff)

trunk/dports/multimedia/XviD/Portfile

@@ -58 +58 @@
 }
 
+build.args          V=1
+destroot.args       V=1
+
 post-destroot {
     set docdir ${prefix}/share/doc/${name}

trunk/dports/multimedia/XviD/files/patch-Makefile.diff

@@ -1 @@
-# Display the compile, assemble and link commands, to assist debugging.
 --- Makefile.orig       2011-05-19 03:27:26.000000000 -0500
-+++ Makefile    2011-08-17 05:00:27.000000000 -0500
-@@ -94,7 +94,7 @@
++++ Makefile    2011-08-20 13:32:47.000000000 -0500
+@@ -45,6 +45,12 @@
+ include platform.inc
+ endif
+ 
++ifeq ($(V),1)
++SILENT =
++else
++SILENT = @
++endif
++
+ RM = rm -rf
+ 
+ ##############################################################################
+@@ -85,7 +91,7 @@
+ 
+ $(BUILD_DIR):
+        @echo "  D: $(BUILD_DIR)"
+-       @$(INSTALL) -d $(BUILD_DIR)
++       $(SILENT)$(INSTALL) -d $(BUILD_DIR)
+ 
+ #-----------------------------------------------------------------------------
+ # Generic assembly rule
+@@ -94,7 +100,7 @@
  .$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
         @echo "  A: $(@D)/$(<F)"
         @$(INSTALL) -d $(BUILD_DIR)/$(@D)
 -       @$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
-+       $(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
++       $(SILENT)$(AS) $(AFLAGS) $< -o $(BUILD_DIR)/$@
  
  #-----------------------------------------------------------------------------
  # Generic C rule
-@@ -105,7 +105,7 @@
+@@ -105,7 +111,7 @@
  .c.$(OBJECT_EXTENSION):
         @echo "  C: $(@D)/$(<F)"
         @$(INSTALL) -d $(BUILD_DIR)/$(@D)
 -       @$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
-+       $(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
++       $(SILENT)$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $(BUILD_DIR)/$@
  
  #-----------------------------------------------------------------------------
  # Static Library
-@@ -113,7 +113,7 @@
+@@ -113,7 +119,7 @@
  
  $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
         @echo "  L: $(@F)"
 -       @cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
-+       cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
++       $(SILENT)cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
  
  #-----------------------------------------------------------------------------
  # Shared Library
-@@ -134,7 +134,7 @@
+@@ -134,7 +140,7 @@
         @echo "  L: $(@F)"
         @$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
         @$(INSTALL) -m 644 libxvidcore.ld $(BUILD_DIR)/libxvidcore.ld
 -       @cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
-+       cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
++       $(SILENT)cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
  
  #-----------------------------------------------------------------------------
  # Installation
+@@ -142,15 +148,15 @@
+ 
+ install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)
+        @echo "  D: $(libdir)"
+-       @$(INSTALL) -d $(DESTDIR)$(libdir)
++       $(SILENT)$(INSTALL) -d $(DESTDIR)$(libdir)
+        @echo "  I: $(libdir)/$(SHARED_LIB)"
+-       @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
++       $(SILENT)$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
+        @echo "  I: $(libdir)/$(STATIC_LIB)"
+-       @$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
++       $(SILENT)$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
+        @echo "  D: $(includedir)"
+-       @$(INSTALL) -d $(DESTDIR)$(includedir)
++       $(SILENT)$(INSTALL) -d $(DESTDIR)$(includedir)
+        @echo "  I: $(includedir)/xvid.h"
+-       @$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
++       $(SILENT)$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
+ 
+ #-----------------------------------------------------------------------------
+ # Platorm specific file -- dumb rules for people executing make before