[32871] trunk/dports/aqua/fltk

ryandesign at macports.org ryandesign at macports.org
Mon Jan 14 01:29:58 PST 2008 

Revision: 32871
          http://trac.macosforge.org/projects/macports/changeset/32871
Author:   ryandesign at macports.org
Date:     2008-01-14 01:29:56 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
fltk: fix names of patchfiles to match recommendations

Modified Paths:
--------------
    trunk/dports/aqua/fltk/Portfile

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff
    trunk/dports/aqua/fltk/files/patch-makeinclude.in.diff

Removed Paths:
-------------
    trunk/dports/aqua/fltk/files/patch-fluid-Makefile
    trunk/dports/aqua/fltk/files/patch-makeinclude.in

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2008-01-14 09:23:24 UTC (rev 32870)
+++ trunk/dports/aqua/fltk/Portfile	2008-01-14 09:29:56 UTC (rev 32871)
@@ -37,8 +37,8 @@
                 port:libpng \
                 port:zlib
 
-patchfiles      patch-fluid-Makefile \
-                patch-makeinclude.in
+patchfiles      patch-fluid-Makefile.diff \
+                patch-makeinclude.in.diff
 
 post-patch {
     reinplace "s|/Applications|/Applications/MacPorts/${name}|g" \

Deleted: trunk/dports/aqua/fltk/files/patch-fluid-Makefile
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile	2008-01-14 09:23:24 UTC (rev 32870)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile	2008-01-14 09:29:56 UTC (rev 32871)
@@ -1,19 +0,0 @@
---- fluid/Makefile.orig	2007-04-12 09:44:06.000000000 -0400
-+++ fluid/Makefile	2007-04-12 09:47:26.000000000 -0400
-@@ -82,7 +82,6 @@
- 	-$(MKDIR) $(DESTDIR)$(bindir)
- 	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
- 	$(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
--	$(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT)
- 	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT)
- 
- install-linux:
-@@ -103,7 +102,7 @@
- 	$(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist
- 	$(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo
- 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS
--	$(LN) $(bindir)/fluid $(DESTDIR)/Application/fluid.app/Contents/MacOS/fluid
-+	$(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid
- 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources
- 	$(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources
- 

Copied: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff (from rev 32740, trunk/dports/aqua/fltk/files/patch-fluid-Makefile)
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	2008-01-14 09:29:56 UTC (rev 32871)
@@ -0,0 +1,19 @@
+--- fluid/Makefile.orig	2007-04-12 09:44:06.000000000 -0400
++++ fluid/Makefile	2007-04-12 09:47:26.000000000 -0400
+@@ -82,7 +82,6 @@
+ 	-$(MKDIR) $(DESTDIR)$(bindir)
+ 	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 	$(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+-	$(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 
+ install-linux:
+@@ -103,7 +102,7 @@
+ 	$(CP) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist
+ 	$(CP) fluid.app/Contents/PkgInfo $(DESTDIR)/Applications/fluid.app/Contents/PkgInfo
+ 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS
+-	$(LN) $(bindir)/fluid $(DESTDIR)/Application/fluid.app/Contents/MacOS/fluid
++	$(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid
+ 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources
+ 	$(CP) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources
+ 

Deleted: trunk/dports/aqua/fltk/files/patch-makeinclude.in
===================================================================
--- trunk/dports/aqua/fltk/files/patch-makeinclude.in	2008-01-14 09:23:24 UTC (rev 32870)
+++ trunk/dports/aqua/fltk/files/patch-makeinclude.in	2008-01-14 09:29:56 UTC (rev 32871)
@@ -1,36 +0,0 @@
-$OpenBSD: patch-makeinclude_in,v 1.3 2006/10/19 09:41:32 wilfried Exp $
---- makeinclude.in.orig	Sun Jan 15 19:36:16 2006
-+++ makeinclude.in	Thu Oct 19 10:37:16 2006
-@@ -110,32 +110,24 @@ CAT6EXT		= @CAT6EXT@
- INSTALL_DESKTOP	= @INSTALL_DESKTOP@
- UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
- 
--# Be quiet when building...
--.SILENT:
--
- # Build commands and filename extensions...
- .SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
- 
- .o$(EXEEXT):
--	echo Linking $@...
- 	$(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
- 	$(POSTBUILD) $@ ../FL/mac.r
- 
- .c.o:
--	echo Compiling $<...
- 	$(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
- 
- .cxx.o:
--	echo Compiling $<...
- 	$(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
- 
- .man.0 .man.1 .man.3:
--	echo Formatting $<...
- 	rm -f $@
- 	$(NROFF) -man $< >$@
- 
- .man.z:
--	echo Formatting $<...
- 	rm -f $@ t.z
- 	$(NROFF) -man $< >t
- 	pack -f t

Copied: trunk/dports/aqua/fltk/files/patch-makeinclude.in.diff (from rev 32740, trunk/dports/aqua/fltk/files/patch-makeinclude.in)
===================================================================
--- trunk/dports/aqua/fltk/files/patch-makeinclude.in.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-makeinclude.in.diff	2008-01-14 09:29:56 UTC (rev 32871)
@@ -0,0 +1,36 @@
+$OpenBSD: patch-makeinclude_in,v 1.3 2006/10/19 09:41:32 wilfried Exp $
+--- makeinclude.in.orig	Sun Jan 15 19:36:16 2006
++++ makeinclude.in	Thu Oct 19 10:37:16 2006
+@@ -110,32 +110,24 @@ CAT6EXT		= @CAT6EXT@
+ INSTALL_DESKTOP	= @INSTALL_DESKTOP@
+ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 
+-# Be quiet when building...
+-.SILENT:
+-
+ # Build commands and filename extensions...
+ .SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
+ 
+ .o$(EXEEXT):
+-	echo Linking $@...
+ 	$(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+ 	$(POSTBUILD) $@ ../FL/mac.r
+ 
+ .c.o:
+-	echo Compiling $<...
+ 	$(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $<
+ 
+ .cxx.o:
+-	echo Compiling $<...
+ 	$(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
+ 
+ .man.0 .man.1 .man.3:
+-	echo Formatting $<...
+ 	rm -f $@
+ 	$(NROFF) -man $< >$@
+ 
+ .man.z:
+-	echo Formatting $<...
+ 	rm -f $@ t.z
+ 	$(NROFF) -man $< >t
+ 	pack -f t

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080114/e743640c/attachment-0001.html

More information about the macports-changes mailing list