[97178] trunk/dports/multimedia/subtitleripper

[jmr at macports.org]

Revision: 97178
          https://trac.macports.org/changeset/97178
Author:   jmr at macports.org
Date:     2012-08-29 03:02:26 -0700 (Wed, 29 Aug 2012)
Log Message:
-----------
subtitleripper: really fix build on lion (#34765)

Modified Paths:
--------------
    trunk/dports/multimedia/subtitleripper/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/subtitleripper/files/
    trunk/dports/multimedia/subtitleripper/files/Makefile.patch

Modified: trunk/dports/multimedia/subtitleripper/Portfile
===================================================================
--- trunk/dports/multimedia/subtitleripper/Portfile	2012-08-29 09:07:36 UTC (rev 97177)
+++ trunk/dports/multimedia/subtitleripper/Portfile	2012-08-29 10:02:26 UTC (rev 97178)
@@ -28,15 +28,20 @@
                     port:libpng \
                     port:transcode
 
+patchfiles          Makefile.patch
+
 use_configure       no
 
+set defines ""
 if {${os.platform} == "darwin" && ${os.major} >= 11} {
-    configure.cflags-append -DHAVE_GETLINE
+    set defines -DHAVE_GETLINE
 }
 
-build.args          CC="${configure.cc} ${configure.cc_archflags}" \
-                    CFLAGS="${configure.cflags}" \
-                    LDFLAGS="${configure.ldflags}"
+build.env           DEFINES="${defines}" \
+                    INCLUDES="${configure.cppflags}" \
+                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}"
+build.args          CC="${configure.cc}" \
+                    COPT="${configure.cflags} ${configure.cc_archflags}"
 
 destroot {
     xinstall -W ${worksrcpath} \

Added: trunk/dports/multimedia/subtitleripper/files/Makefile.patch
===================================================================
--- trunk/dports/multimedia/subtitleripper/files/Makefile.patch	                        (rev 0)
+++ trunk/dports/multimedia/subtitleripper/files/Makefile.patch	2012-08-29 10:02:26 UTC (rev 97178)
@@ -0,0 +1,38 @@
+--- Makefile.orig	2003-12-08 20:28:02.000000000 +1100
++++ Makefile	2012-08-29 19:59:24.000000000 +1000
+@@ -3,9 +3,9 @@
+ #
+ 
+ # use always:
+-DEFINES :=  
++#DEFINES :=  
+ LIBS    := -lm 
+-INCLUDES :=
++#INCLUDES :=
+ 
+ ### enable ppm support ###
+ DEFINES  += -D_HAVE_LIB_PPM_
+@@ -70,19 +70,19 @@
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $(LDFLAGS) $(LIBS) $^ -o $@
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $(LDFLAGS) $(LIBS) $^ -o $@
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) $(LDFLAGS) $(LIBS) -g $^ -o $@
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) $(LDFLAGS) $(LIBS) -g $^ -o $@
+ 
+ .PHONY: clean dist rpm
+ clean:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120829/23eb0e04/attachment.html>