[19969] trunk/dports/x11/fltk

[source_changes at macosforge.org]

Revision: 19969
          http://trac.macosforge.org/projects/macports/changeset/19969
Author:   markd at macports.org
Date:     2006-10-07 00:44:46 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Fixes build problem; possibly closes 10102.  Update to 1.1.7.

Modified Paths:
--------------
    trunk/dports/x11/fltk/Portfile
    trunk/dports/x11/fltk/files/patch-configure
    trunk/dports/x11/fltk/files/patch-fltk-config.in

Modified: trunk/dports/x11/fltk/Portfile
===================================================================
--- trunk/dports/x11/fltk/Portfile	2006-10-07 07:39:22 UTC (rev 19968)
+++ trunk/dports/x11/fltk/Portfile	2006-10-07 07:44:46 UTC (rev 19969)
@@ -2,9 +2,9 @@
 
 PortSystem    1.0
 name          fltk
-version       1.1.6
+version       1.1.7
 categories    x11
-maintainers   darwinports at opendarwin.org
+maintainers   nomaintainer at macports.org
 description   Fast Light Tool Kit
 homepage      http://www.fltk.org/
 platforms     darwin
@@ -21,16 +21,17 @@
     FLTK also includes an excellent UI builder called FLUID \
     that can be used to create applications in minutes.
 
-master_sites   sourceforge
+master_sites	http://ftp.easysw.com/pub/fltk/1.1.7/
 
 use_bzip2      yes
 distfiles      ${name}-${version}-source${extract.suffix}
-checksums      md5 95d340977d13edea12e98d787a668b32
+checksums      md5 2e29319119adc9d63b2f26b72cae0a88
 
 depends_lib    lib:libX11.6:XFree86 port:jpeg \
                port:libpng port:Xft2 port:zlib
 
-patchfiles     patch-fltk-config.in patch-makeinclude.in
+patchfiles	patch-configure patch-fltk-config.in patch-makeinclude.in patch-fluid-Makefile
+
 post-patch {
     reinplace "s|Carbon.H|Carbon.h|g" \
         ${worksrcpath}/src/Fl_Menu.cxx \
@@ -45,18 +46,11 @@
                --mandir=${prefix}/share/man \
                --with-x
 
-variant darwin {
-    patchfiles-append patch-configure
-}
-
-variant macosx {
-    patchfiles-append patch-fluid-Makefile
-    post-install {
+post-activate {
         ui_msg "
 ==============================================================
 You need to do 
 'sudo fltk-config --post /Applications/DarwinPorts/fltk/fluid'
 before using fluid
 =============================================================="
-    }
-}
\ No newline at end of file
+}

Modified: trunk/dports/x11/fltk/files/patch-configure
===================================================================
--- trunk/dports/x11/fltk/files/patch-configure	2006-10-07 07:39:22 UTC (rev 19968)
+++ trunk/dports/x11/fltk/files/patch-configure	2006-10-07 07:44:46 UTC (rev 19969)
@@ -1,6 +1,6 @@
---- configure.orig	2005-06-18 21:54:39.000000000 -0400
-+++ configure	2005-06-18 21:55:10.000000000 -0400
-@@ -1388,7 +1388,7 @@
+--- configure.org	2006-10-06 23:46:08.000000000 -0700
++++ configure	2006-10-06 23:53:44.000000000 -0700
+@@ -1423,7 +1423,7 @@
              FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib"
              GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
              IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib"
@@ -9,3 +9,21 @@
  	    ;;
  
  	SunOS* | UNIX_S*)
+@@ -7516,7 +7516,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ljpeg  $LIBS"
++LIBS="$(prefix)/lib -ljpeg  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -7710,7 +7710,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="$(prefix)/lib -lpng  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF

Modified: trunk/dports/x11/fltk/files/patch-fltk-config.in
===================================================================
--- trunk/dports/x11/fltk/files/patch-fltk-config.in	2006-10-07 07:39:22 UTC (rev 19968)
+++ trunk/dports/x11/fltk/files/patch-fltk-config.in	2006-10-07 07:44:46 UTC (rev 19969)
@@ -1,11 +1,11 @@
---- fltk-config.in.orig	2005-06-18 22:22:02.000000000 -0400
-+++ fltk-config.in	2005-06-18 22:22:51.000000000 -0400
-@@ -43,7 +43,7 @@
- srcdir=@srcdir@
+--- fltk-config.in.org	2005-12-07 12:13:12.000000000 -0800
++++ fltk-config.in	2006-10-06 21:07:56.000000000 -0700
+@@ -47,7 +47,7 @@
  
  # compiler names
+ CC="@CC@"
 -CXX="@CXX@"
 +CXX="g++"
- CC="@CC@"
  
  # post-process command (only needed for MacOS)
+ POSTBUILD="@POSTBUILD@"

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