Merge pull request #97 from fink/fltk13-update

fltk13-aqua 1.3.4

10.9-libcxx/stable/main/finkinfo/libs/fltk13-aqua.info

@@ -1,6 +1,6 @@
 Package: fltk13-aqua
-Version: 1.3.3
-Revision: 3
+Version: 1.3.4
+Revision: 1
 Maintainer: None <fink-devel@lists.sourceforge.net>
 #
 Description: GUI toolkit (Aqua graphics)
@@ -40,12 +40,6 @@ Patch to show actual compiling commands, not synopses of them.
 
 Don't continue if any make target fails.
 
-Patch to avoid chmod +x on libraries.
-
-Patch for libjpeg9 as described in http://www.fltk.org/str.php?L2920.
-
-Patch fluid/Fl_Type.h for stricter clang from Xcode 5.1+.
-
 As of 1.3.3-3:  Patch FL/mac.h to assume Fl_Font.H is in FL/ rather 
 				than in ../src, and manually install that header
 				After install in root directory, comment out XUtf8FontStruct 
@@ -71,39 +65,58 @@ As of 1.3.3-3:  Patch FL/mac.h to assume Fl_Font.H is in FL/ rather
 Homepage: http://www.fltk.org/
 License: LGPL
 #
-BuildDepends: libjpeg9, libpng16, fink ( >= 0.30.0 )
-Depends: %N-shlibs (= %v-%r), macosx, libjpeg9-shlibs, libpng16-shlibs
+BuildDepends: <<
+	fink ( >= 0.30.0 ),
+	libjpeg9,
+	libpng16
+<<
+Depends: <<
+	%N-shlibs (= %v-%r),
+	libjpeg9-shlibs,
+	libpng16-shlibs,
+	macosx
+<<
 Conflicts: fltk-x11, fltk, fltk-aqua, fltk13-x11
 Replaces: fltk-x11, fltk, fltk-aqua, fltk13-x11
 BuildDependsOnly: true
 #
-Source: http://fltk.org/pub/fltk/%v/fltk-%v-source.tar.gz
+Source: http://fltk.org/pub/fltk/%v/fltk-%v-2-source.tar.gz
 #
-SourceDirectory: fltk-%v
-Source-MD5: 9ccdb0d19dc104b87179bd9fd10822e3
-Source-Checksum: SHA1(873aac49b277149e054b9740378e2ca87b0bd435)
+SourceDirectory: fltk-%v-2
+Source-MD5: b8e291343357e49dd81a22408744e400
+Source-Checksum: SHA1(239f0d915c80c0be91dad3f64dacbfad82133bee)
 
 PatchFile: %n.patch
-PatchFile-MD5: 8186277b500f61fef0d1430233a6fef1
+PatchFile-MD5: 7def8a4cb4ac70620b47bab56667e20e
 
 PatchScript: <<
 #!/bin/sh -ev
   sed 's|@FINKPREFIX@|%p|' %{PatchFile} | patch -p1
-  perl -pi -e 's/\*l=0/*l/g' fluid/Fl_Type.h
-  mv fltk-config.in fltk-config.in.old
-  sed 's: prefix=$optarg: prefix=$optarg; includedir=${prefix}/include:' < fltk-config.in.old > fltk-config.in
-  mv fluid/Makefile fluid/Makefile.old
-  sed 's;$(bindir)/fltk-config;$(bindir)/fltk-config --prefix=$(prefix);' < fluid/Makefile.old > fluid/Makefile
+  #perl -pi -e 's/\*l=0/*l/g' fluid/Fl_Type.h
+  #mv fltk-config.in fltk-config.in.old
+  #sed 's: prefix=$optarg: prefix=$optarg; includedir=${prefix}/include:' < fltk-config.in.old > fltk-config.in
+  #mv fluid/Makefile fluid/Makefile.old
+  #sed 's;$(bindir)/fltk-config;$(bindir)/fltk-config --prefix=$(prefix);' < fluid/Makefile.old > fluid/Makefile
+  # Don't print the silent versions of the compiler commands
   perl -ni -e 'print unless /echo.*COMMAND/' src/Makefile
-  perl -pi -e 's/\|\| break//' Makefile
-  perl -pi -e 's/ 755 / 644 / if /\/lib.*\.{a,dylib}/' src/Makefile
+  #perl -pi -e 's/\|\| break//' Makefile
+  #perl -pi -e 's/ 755 / 644 / if /\/lib.*\.{a,dylib}/' src/Makefile
+  # don't install manpages (see DescPackaging)
   perl -ni -e 'print unless /mandir\)\/cat/' documentation/Makefile
+  # variantize doc install location
   perl -pi -e 's|share/doc/fltk|share/doc/%n/html|g' configure
-  perl -pi -e 's|from_parent\-\>deparent\(from\) \< 0|\!\(from_parent\-\>deparent\(from\)\)|g' src/Fl_Tree_Item.cxx
+  #perl -pi -e 's|from_parent\-\>deparent\(from\) \< 0|\!\(from_parent\-\>deparent\(from\)\)|g' src/Fl_Tree_Item.cxx
 <<
 #
 GCC: 4.0
-ConfigureParams: --mandir=%p/share/man --libdir=%p/lib/%n/lib --enable-shared --enable-threads --without-links --without-x
+ConfigureParams: <<
+	--mandir=%p/share/man \
+	--libdir=%p/lib/%n/lib \
+	--enable-shared \
+	--enable-threads \
+	--without-links \
+	--without-x
+<<
 SetCXXFLAGS: -O2 -g -std=c++0x
 #
 #### Default CompileScript ####
@@ -127,34 +140,36 @@ AppBundles: fluid/fluid.app
 DocFiles: CHANGES COPYING CREDITS README README.OSX.txt
 #
 Splitoff: <<
-Package:  %N-shlibs
-Depends: libjpeg9-shlibs, libpng16-shlibs, macosx
-Conflicts: fltk
-Replaces: fltk
-BuildDependsOnly: false
-Files:  <<
-lib/%N/lib/*.1.3.dylib 
-bin/%N-config
-<<
-Shlibs: <<
-	%p/lib/fltk13-aqua/lib/libfltk.1.3.dylib 			1.3.0 %n (>=1.3.0-1)
-	%p/lib/fltk13-aqua/lib/libfltk_forms.1.3.dylib 		1.3.0 %n (>=1.3.0-1)
-	%p/lib/fltk13-aqua/lib/libfltk_gl.1.3.dylib 		1.3.0 %n (>=1.3.0-1)
-	%p/lib/fltk13-aqua/lib/libfltk_images.1.3.dylib 	1.3.0 %n (>=1.3.0-1)
-<<
-DescUsage: <<
-This package contains the shared libraries.
-
-Any package that Depends on this one and builds an app bundle may need 
-to have the following in a PostInstScript:
-
-fltk13-aqua-config.aqua --post <name of executable>
-
-where <name of executable> is the real executable, not just the app bundle.
-This is because even if the package is set up properly, packing the 
-.deb appears to clobber the resource fork.
-
-DocFiles: CHANGES COPYING CREDITS README README.mac
-
-<<
+Package: %N-shlibs
+	Depends: <<
+		libjpeg9-shlibs,
+		libpng16-shlibs,
+		macosx
+	<<
+	Conflicts: fltk
+	Replaces: fltk
+	BuildDependsOnly: false
+	Files:  <<
+		lib/%N/lib/*.1.3.dylib 
+		bin/%N-config
+	<<
+	Shlibs: <<
+		%p/lib/fltk13-aqua/lib/libfltk.1.3.dylib 			1.3.0 %n (>=1.3.0-1)
+		%p/lib/fltk13-aqua/lib/libfltk_forms.1.3.dylib 		1.3.0 %n (>=1.3.0-1)
+		%p/lib/fltk13-aqua/lib/libfltk_gl.1.3.dylib 		1.3.0 %n (>=1.3.0-1)
+		%p/lib/fltk13-aqua/lib/libfltk_images.1.3.dylib 	1.3.0 %n (>=1.3.0-1)
+	<<
+	DescUsage: <<
+		This package contains the shared libraries.
+
+		Any package that Depends on this one and builds an app bundle may need 
+		to have the following in a PostInstScript:
+
+		fltk13-aqua-config.aqua --post <name of executable>
+
+		where <name of executable> is the real executable, not just the app bundle.
+		This is because even if the package is set up properly, packing the 
+		.deb appears to clobber the resource fork.
+	<<
+	DocFiles: CHANGES COPYING CREDITS README README.OSX.txt
 <<