[23897] trunk/dports/aqua/fltk

[source_changes at macosforge.org]

Revision: 23897
          http://trac.macosforge.org/projects/macports/changeset/23897
Author:   yves at macports.org
Date:     2007-04-12 07:14:21 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
revision 2
enable verbose build
fix fltk-config step for fluid

Revision Links:
--------------
    http://trac.macosforge.org/projects/macports/changeset/2

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

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/
    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	2007-04-12 13:45:23 UTC (rev 23896)
+++ trunk/dports/aqua/fltk/Portfile	2007-04-12 14:14:21 UTC (rev 23897)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name            fltk
 version         1.1.7
-revision        1
+revision        2
 categories      aqua devel
 maintainers     nomaintainer at macports.org
 description     Fast Light Tool Kit
@@ -30,9 +30,10 @@
 
 depends_lib     port:jpeg port:libpng port:zlib
 
+patchfiles      patch-fluid-Makefile \
+                patch-makeinclude.in
+
 post-patch {
-    reinplace "s|Application/|Applications/|g" \
-        ${worksrcpath}/fluid/Makefile
     reinplace "s|/Applications|/Applications/MacPorts/${name}|g" \
         ${worksrcpath}/fluid/Makefile \
         ${worksrcpath}/test/Makefile
@@ -42,3 +43,8 @@
                 --mandir=${prefix}/share/man
 
 destroot.target install install-desktop
+
+post-activate {
+    cd ${prefix}/bin
+    system "./fltk-config --post fluid"
+}

Added: trunk/dports/aqua/fltk/files/patch-fluid-Makefile
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile	2007-04-12 14:14:21 UTC (rev 23897)
@@ -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
+ 

Added: trunk/dports/aqua/fltk/files/patch-makeinclude.in
===================================================================
--- trunk/dports/aqua/fltk/files/patch-makeinclude.in	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-makeinclude.in	2007-04-12 14:14:21 UTC (rev 23897)
@@ -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/20070412/974b3556/attachment.html