[127818] trunk/dports/aqua/fltk

michaelld at macports.org michaelld at macports.org
Tue Nov 4 08:26:03 PST 2014


Revision: 127818
          https://trac.macports.org/changeset/127818
Author:   michaelld at macports.org
Date:     2014-11-04 08:26:03 -0800 (Tue, 04 Nov 2014)
Log Message:
-----------
fltk:
+ merge release and devel into a single Portfile;
+ update release to 1.3.3;
+ update devel to r10425.

Revision Links:
--------------
    https://trac.macports.org/changeset/10425

Modified Paths:
--------------
    trunk/dports/aqua/fltk/Portfile
    trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff
    trunk/dports/aqua/fltk/files/patch-src-Makefile.diff

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2014-11-04 15:53:44 UTC (rev 127817)
+++ trunk/dports/aqua/fltk/Portfile	2014-11-04 16:26:03 UTC (rev 127818)
@@ -4,14 +4,11 @@
 PortSystem      1.0
 
 name            fltk
-conflicts       fltk-devel
-version         1.3.2
-revision        2
 categories      aqua devel
 license         LGPL
 platforms       macosx
-maintainers     nomaintainer
-description     Fast Light Tool Kit
+maintainers     michaelld openmaintainer
+description     Fast Light Tool Kit Version 1.3
 
 long_description \
     FLTK (pronounced fulltick) \
@@ -20,53 +17,96 @@
     FLTK provides modern GUI functionality without the bloat \
     and supports 3D graphics via OpenGL and \
     its built-in GLUT emulation. \
-    \
     FLTK is designed to be small and modular enough to be \
     statically linked, but works fine as a shared library. \
     FLTK also includes an excellent UI builder called FLUID \
     that can be used to create applications in minutes.
 
 homepage        http://www.fltk.org/
-master_sites    http://fltk.org/pub/fltk/${version}/
-worksrcdir      ${name}-${version}
-distname        ${worksrcdir}-source
 
-checksums           rmd160  5d697cb582cb80a1eca50c35696731eea5591768 \
-                    sha256  176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4
+livecheck.type  regexm
+livecheck.url   ${homepage}
 
+subport fltk-devel {}
+
+if {${subport} eq ${name}} {
+
+    conflicts       fltk-devel
+
+    version         1.3.3
+    master_sites    http://fltk.org/pub/fltk/${version}/
+    worksrcdir      ${name}-${version}
+    distname        ${worksrcdir}-source
+
+    checksums       rmd160 a1736ec7da1ff751153e09bc5b5136d2fa95c18b \
+                    sha256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
+
+    livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
+
+} else {
+
+    long_description ${long_description} \
+        This port provides snapshot released of FLTK, updated weekly to monthly.
+
+    conflicts       fltk
+
+    version         1.3.x-r10425
+    checksums       rmd160 688af6369fa558d6423da416ca6a26deb967af70 \
+                    sha256 34618e1e58edb1c3d5b41da5cac95e8de90a344618aad8848999bd00ff9b5406
+
+    master_sites    http://fltk.org/pub/fltk/snapshots/
+    distname        fltk-${version}
+    use_bzip2       yes
+
+    livecheck.regex "Snapshots:.*\n.*v(1\\.3\\.x-r\\d+)"
+
+}
+
 depends_lib     port:jpeg \
                 port:libpng \
                 port:zlib
 
-use_parallel_build  yes
-
 patchfiles      patch-fluid-Makefile.diff \
-                patch-src-Makefile.diff
+                patch-src-Makefile.diff \
+                patch-src-Fl_JPEG_Image.cxx.diff
 
 post-patch {
-    reinplace "s|/Applications|${applications_dir}/${name}|g" \
+
+    reinplace "s|/Applications|${applications_dir}/fltk|g" \
         ${worksrcpath}/fluid/Makefile \
         ${worksrcpath}/test/Makefile
-    
+
     # Disable silent rules
     reinplace "/^\\.SILENT:$/d" ${worksrcpath}/makeinclude.in
+
+    # tell fltk's make script to create config.sub, which is required
+    # before configure will execute properly.  This command actually
+    # runs configure through once, to create the file; we then call
+    # configure manually with the correct arguments, which overwrites
+    # this (and other) files to be what we want.  Make sure CC is set
+    # correctly per "using the right compiler".  While this port will
+    # work correctly without this addition, doing this allows the port
+    # to not error out on dev's systems set up to check whether the
+    # right compiler is being used.
+
+    system -W ${worksrcpath} "CC=${configure.cc} make config.sub"
+
 }
 
-variant universal {}
+pre-configure {
+    configure.args-append \
+        --with-archflags="[get_canonical_archflags]"
+}
 
 configure.args  --enable-shared \
                 --disable-localjpeg \
                 --disable-localzlib \
-                --disable-localpng \
-                --with-archflags="[get_canonical_archflags]"
+                --disable-localpng
 
+configure.universal_args-delete --disable-dependency-tracking
+
 post-configure {
     reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/fltk-config
 }
 
-destroot.target install \
-                install-desktop
-
-livecheck.type  regexm
-livecheck.url   ${homepage}
-livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
+destroot.target install install-desktop

Modified: trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	2014-11-04 15:53:44 UTC (rev 127817)
+++ trunk/dports/aqua/fltk/files/patch-fluid-Makefile.diff	2014-11-04 16:26:03 UTC (rev 127818)
@@ -1,11 +1,18 @@
---- fluid/Makefile.orig	2012-09-09 10:28:39.000000000 -0500
-+++ fluid/Makefile	2012-09-09 10:30:39.000000000 -0500
-@@ -54,7 +54,7 @@
+--- fluid/Makefile.orig	2013-11-29 14:01:44.000000000 -0500
++++ fluid/Makefile	2013-11-29 14:02:38.000000000 -0500
+@@ -48,13 +48,13 @@
+ fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
+ 			$(IMGLIBNAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
+ 	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
+ 
  fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
  			../src/$(IMGDSONAME)
  	echo Linking $@...
--	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
-+	$(CXX) $(ARCHFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS) $(LDFLAGS)
  
  clean:
  	-$(RM) *.o core.* *~ *.bck *.bck

Added: trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src-Fl_JPEG_Image.cxx.diff	2014-11-04 16:26:03 UTC (rev 127818)
@@ -0,0 +1,20 @@
+--- src/Fl_JPEG_Image.cxx.orig	2014-03-03 11:38:51.000000000 -0500
++++ src/Fl_JPEG_Image.cxx	2014-03-03 11:39:21.000000000 -0500
+@@ -155,7 +155,7 @@
+   
+   jpeg_create_decompress(&dinfo);
+   jpeg_stdio_src(&dinfo, fp);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+   
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;
+@@ -337,7 +337,7 @@
+   
+   jpeg_create_decompress(&dinfo);
+   jpeg_mem_src(&dinfo, data);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+   
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;

Modified: trunk/dports/aqua/fltk/files/patch-src-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile.diff	2014-11-04 15:53:44 UTC (rev 127817)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile.diff	2014-11-04 16:26:03 UTC (rev 127818)
@@ -1,8 +1,8 @@
---- src/Makefile.orig	2011-07-18 23:49:30.000000000 -0500
-+++ src/Makefile	2012-09-09 11:35:36.000000000 -0500
-@@ -355,7 +355,7 @@
+--- src/Makefile.orig	2014-10-30 12:05:22.000000000 -0400
++++ src/Makefile	2014-11-04 09:24:43.000000000 -0500
+@@ -360,7 +360,7 @@
  		-install_name $(libdir)/$@ \
- 		-current_version 1.3.0 \
+ 		-current_version 1.3.3 \
  		-compatibility_version 1.3.0 \
 -		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk
 +		$(IMGOBJECTS)  -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141104/154a6d54/attachment.html>


More information about the macports-changes mailing list