Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29686/x11

Added Files:
        xforms2-shlibs.info xforms2-shlibs.patch 
Log Message:
new libN=2 of xforms 1.0.93sp1

--- NEW FILE: xforms2-shlibs.info ---
Package: xforms2-shlibs
Version: 1.0.93sp1
Revision: 1
Source: http://savannah.nongnu.org/download/xforms/xforms-%v.tar.gz
Source-MD5: 68ed76216be9b09032e22736d95c8b3c
Depends: <<
        libjpeg9-shlibs,
        x11
<<
Replaces: xforms (<< 0.99-1)
BuildDepends: <<
        autoconf2.6,
        automake1.13,
        libjpeg9,
        libtool2,
        fink-package-precedence,
        x11-dev
<<
PatchFile: %n.patch
PatchFile-MD5: ee9563e05403b109a964ec00c7eb8d1a
PatchScript: <<
        %{default_script}
        sed -i.bak '/^# libtool.m4/,$d' acinclude.m4
<<
ConfigureParams: --enable-gl --disable-static --x-includes=/usr/X11R6/include
CompileScript: <<
        autoreconf -fi
        %{default_script}
        fink-package-precedence --prohibit-bdep=%n,xforms2 .
<<
InstallScript: <<
        make install DESTDIR=%d
<<
Shlibs: <<
        %p/lib/libflimage.2.dylib 3.0.0 %n (>= 1.0.93sp1-1)
        %p/lib/libforms.2.dylib 3.0.0 %n (>= 1.0.93sp1-1)
        %p/lib/libformsGL.2.dylib 3.0.0 %n (>= 1.0.93sp1-1)
<<
SplitOff: <<
        Package: xforms2
        Conflicts: <<
                xforms,
                xforms2
        <<
        Replaces: <<
                xforms-shlibs (<= 1.0-1),
                xforms-bin (<< 1.0.90-2),
                xforms,
                xforms2
        <<
        Depends: xforms2-shlibs (= %v-%r)
        BuildDependsOnly: true
        Files: <<
                include
                lib/lib*.la
                lib/lib{flimage,forms,formsGL}.dylib
                share/man/man5
        <<
        DocFiles: ChangeLog Copyright COPYING.LIB README NEWS
<<
SplitOff2: <<
        Package: xforms-bin
        Replaces: xforms (<< 0.99-1)
        Depends: %N (= %v-%r), x11
        Files:  bin share/man/man1
        DocFiles: COPYING.LIB README NEWS
<<
DescPackaging: <<
        Redo ancient autotools to get two-level and other darwin tricks
        
        nieder: updated to 1.0.93sp1.  New libN means new package
                        xforms2-shlibs is now parent package to improve libN 
maintenance
<<
Description: GUI toolkit based on Xlib
License: GPL
DocFiles: COPYING.LIB README NEWS
Maintainer: None <fink-de...@lists.sourceforge.net>
Homepage: http://www.nongnu.org/xforms/

--- NEW FILE: xforms2-shlibs.patch ---
diff -Nurd -x'*~' xforms-1.0.93sp1.orig/configure.ac 
xforms-1.0.93sp1/configure.ac
--- xforms-1.0.93sp1.orig/configure.ac  2010-05-24 11:21:56.000000000 -0400
+++ xforms-1.0.93sp1/configure.ac       2013-05-13 09:22:13.000000000 -0400
@@ -39,7 +39,6 @@
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 
 ### check for special systems
 AC_ISC_POSIX
@@ -88,11 +87,20 @@
 # Checks for header files.
 AC_CHECK_HEADERS([sys/select.h])
 
-# Check whether we want to build the gl code
+# Check whether we want to build the gl code (headers may be with X11's)
+AC_PATH_XTRA
 AC_ARG_ENABLE(gl,
   [AS_HELP_STRING([--disable-gl],[Do not build GL support library])])
 if test x$enable_gl != xno ; then
-  AC_CHECK_HEADER([GL/glx.h],, [enable_gl=no])
+  save_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+  AC_CHECK_HEADER([GL/glx.h],, [
+    enable_gl=no
+    if test x$enable_gl != xyes ; then
+      AC_MSG_ERROR([GL requested but not available])
+    fi
+  ])
+  CPPFLAGS=$save_CPPFLAGS
 fi
 AM_CONDITIONAL(BUILD_GL, [test x$enable_gl != xno])
 
@@ -101,7 +109,6 @@
 dnl AC_HEADER_DIRENT
 
 # Check for X, XPM and JPEG
-AC_PATH_XTRA
 XFORMS_PATH_XPM
 XFORMS_CHECK_LIB_JPEG
 
diff -Nurd -x'*~' xforms-1.0.93sp1.orig/fdesign/Makefile.am 
xforms-1.0.93sp1/fdesign/Makefile.am
--- xforms-1.0.93sp1.orig/fdesign/Makefile.am   2009-08-29 18:04:33.000000000 
-0400
+++ xforms-1.0.93sp1/fdesign/Makefile.am        2013-05-13 09:23:19.000000000 
-0400
@@ -57,7 +57,3 @@
        sp_xyplot.c \
        sp_util.c \
        xpm.h
-
-#      viewforms.c \
-#      viewforms.h \
-#      viewforms_main.c
diff -Nurd -x'*~' xforms-1.0.93sp1.orig/gl/Makefile.am 
xforms-1.0.93sp1/gl/Makefile.am
--- xforms-1.0.93sp1.orig/gl/Makefile.am        2009-08-06 15:32:11.000000000 
-0400
+++ xforms-1.0.93sp1/gl/Makefile.am     2013-05-13 09:30:10.000000000 -0400
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info 
@SO_VERSION@
+libformsGL_la_LDFLAGS = -no-undefined -version-info @SO_VERSION@
 
 libformsGL_la_LIBADD = ../lib/libforms.la $(X_LIBS) -lGL -lX11
 
diff -Nurd -x'*~' xforms-1.0.93sp1.orig/image/Makefile.am 
xforms-1.0.93sp1/image/Makefile.am
--- xforms-1.0.93sp1.orig/image/Makefile.am     2009-08-06 15:32:50.000000000 
-0400
+++ xforms-1.0.93sp1/image/Makefile.am  2013-05-13 09:30:17.000000000 -0400
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info 
@SO_VERSION@
+libflimage_la_LDFLAGS = -no-undefined -version-info @SO_VERSION@
 
 libflimage_la_LIBADD = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11
 
diff -Nurd -x'*~' xforms-1.0.93sp1.orig/lib/Makefile.am 
xforms-1.0.93sp1/lib/Makefile.am
--- xforms-1.0.93sp1.orig/lib/Makefile.am       2009-08-06 15:33:25.000000000 
-0400
+++ xforms-1.0.93sp1/lib/Makefile.am    2013-05-13 09:30:23.000000000 -0400
@@ -25,7 +25,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -no-undefined -Wl,--no-undefined -version-info 
@SO_VERSION@
+libforms_la_LDFLAGS = -no-undefined -version-info @SO_VERSION@
 
 libforms_la_LIBADD =  $(X_LIBS) $(XPM_LIB) -lX11
 


------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to