Update of /cvsroot/fink/experimental/dmrrsn
In directory usw-pr-cvs1:/tmp/cvs-serv15114

Added Files:
        xforms-1.0-2.info xforms-1.0-2.patch 
Log Message:
experimental version correcting the splitoff and adding Shlibs


--- NEW FILE: xforms-1.0-2.info ---
Package: xforms
Version: 1.0
Revision: 2
Source: ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/%n-%vRC5.2.tgz
Source-MD5: e6cecdb5a0d1a4e44d26501175b0927a
Depends: %N-shlibs (= %v-%r), %N-bin
Replaces: xforms-shlibs (<= 1.0-1)
BuildDependsOnly: true
BuildDepends: fink (>= 0.9.9), libtiff, libjpeg
PatchScript: <<
  sed 's|@PREFIX@|%p|g' < %a/%f.patch | patch -p1
<<
CompileScript: <<
 xmkmf -a
 make EXTENSIONLIB="-L/usr/X11R6/lib -lXext"
<<
InstallScript: <<
 make install install.man DESTDIR=%d MANPATH=%p/share/man
 (cd demos; /bin/rm -f *.o)
 (mkdir -p %i/share/doc/%n; cp -R demos %i/share/doc/%n)
 /bin/rm -rf %d/usr
 (cd %i/include; ln -s X11/forms.h forms.h)
<<
SplitOff: <<
  Package: %N-shlibs
  Replaces: %N (<< 0.99-1)
  Depends: x11, libtiff-shlibs, libjpeg-shlibs, libgl
  Suggests: %N-bin
  Files: lib/lib*.*.dylib
  Shlibs: <<
   %p/lib/libflimage.1.dylib %n (>= %v-%r)
   %p/lib/libforms.1.dylib %n (>= %v-%r)
   %p/lib/libformsGL.1.dylib %n (>= %v-%r)
  <<
  DocFiles: COPYING 00README 
<<
SplitOff2: <<
  Package: %N-bin
  Replaces: %N (<< 0.99-1)
  Depends: %N-shlibs (= %v-%r)
  Files:  bin share/man
  DocFiles: COPYING 00README
<<
Description: GUI toolkit based on Xlib.
License: GPL
DocFiles: COPYING 00README
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://world.std.com/~xforms/

--- NEW FILE: xforms-1.0-2.patch ---
--- xforms-1.0RC5.2/demos/Imakefile.orig        Wed Oct  9 05:39:01 2002
+++ xforms-1.0RC5.2/demos/Imakefile     Wed Oct  9 05:39:19 2002
@@ -134,7 +134,7 @@
                  -I.
 
 DEPEND_DEFINES = \
-                 -I/usr/local/include
+                 
 
 EXTRA_LIBRARIES        = \
                  $(STATIC) \
--- xforms-1.0RC5.2/fdesign/Imakefile.orig      Wed Oct  9 05:37:55 2002
+++ xforms-1.0RC5.2/fdesign/Imakefile   Wed Oct  9 05:38:18 2002
@@ -89,7 +89,7 @@
                  -I.
 
 DEPEND_DEFINES = \
-                 -I/usr/local/include
+                 
 
 
 EXTRA_LIBRARIES        = \
--- xforms-1.0RC5.2/gl/Imakefile.orig   Wed Oct  9 05:35:35 2002
+++ xforms-1.0RC5.2/gl/Imakefile        Wed Oct  9 06:12:52 2002
@@ -31,7 +31,7 @@
 #endif
 
 #if defined( PpcDarwinArchitecture )
-SHLIBLDFLAGS   += -lSystem -lcc_dynamic
+SHLIBLDFLAGS   += -lSystem -lcc_dynamic -flat_namespace -undefined suppress
 #endif
 
 #if Solaris64Bit
@@ -44,7 +44,7 @@
 REQUIREDLIBS   = \
                  $(LDPRELIB) \
                  $(XLIB) \
-                 -L/usr/local/lib \
+                  \
                  -L../lib -lforms \
                  -lGL \
                  $(LGCC)
@@ -56,7 +56,7 @@
                  -I.
 
 DEPEND_DEFINES = \
-                 -I/usr/local/include
+                 
 
 EXTRA_DEFINES  = \
                  -DMAKING_FORMS \
--- xforms-1.0RC5.2/Imakefile.orig      Wed Oct  9 05:32:31 2002
+++ xforms-1.0RC5.2/Imakefile   Wed Oct  9 05:56:13 2002
@@ -2,7 +2,7 @@
 
 /* Fairly important stuff */
 
-#define OptimizationLevel -O4
+#define OptimizationLevel -O2
 #define DoWall NO
 
 #define BuildShared YES
@@ -32,22 +32,22 @@
 /* Out in the Tall Weeds */
 
 #define InstallNonstandard YES
-#define XFormsNonstandardInstallDir /usr/local
+#define XFormsNonstandardInstallDir @PREFIX@
 
 #define NonstandardXpm NO 
 
 #define XpmIncLoc /put/the/include/path/here
 #define XpmLibLoc /put/the/library/path/here
 
-#define NonstandardTiff NO
+#define NonstandardTiff YES
 
-#define TiffIncLoc /put/the/include/path/here
-#define TiffLibLoc /put/the/library/path/here
+#define TiffIncLoc @PREFIX@/include
+#define TiffLibLoc @PREFIX@/lib
 
 #define NonstandardJpeg NO
 
-#define JpegIncLoc /put/the/include/path/here
-#define JpegLibLoc /put/the/library/path/here
+#define JpegIncLoc @PREFIX@/include
+#define JpegLibLoc @PREFIX@/lib
 
 ######################################################################
 #                                                                    #
--- xforms-1.0RC5.2/lib/Imakefile.orig  Wed Oct  9 05:35:02 2002
+++ xforms-1.0RC5.2/lib/Imakefile       Wed Oct  9 06:12:31 2002
@@ -119,7 +119,7 @@
                  -Ifd
 
 DEPEND_DEFINES = \
-                 -I/usr/local/include
+                 
 
 #if !BuildGL
 NO_GL          = -DNO_GL
@@ -157,7 +157,7 @@
 #endif
 
 #if defined( PpcDarwinArchitecture )
-SHLIBLDFLAGS   += -flat_namespace
+SHLIBLDFLAGS   += -flat_namespace -undefined suppress
 #endif
 
 REQUIREDLIBS   = \
--- xforms-1.0RC5.2/fd2ps/Imakefile.orig        Wed Oct  9 05:38:29 2002
+++ xforms-1.0RC5.2/fd2ps/Imakefile     Wed Oct  9 05:38:51 2002
@@ -29,12 +29,10 @@
 
 OBJS   = $(SRCS:.c=.o)
 
-#if !defined( PpcDarwinArchitecture )
 FORMSLIBDIR     = $(TOP)/lib
 FORMSINCDIR     = $(FORMSLIBDIR)       
 FORMSLIB        = -L$(FORMSLIBDIR) -lforms
 DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
-#endif
 
 IMAGELIBDIR     = $(TOP)/image
 IMAGEINCDIR     = $(IMAGELIBDIR)       
@@ -64,7 +62,7 @@
                  -I.
 
 DEPEND_DEFINES = \
-                 -I/usr/local/include
+                 
 
 EXTRA_LIBRARIES        = \
                  $(STATIC) \
--- xforms-1.0RC5.2/image/Imakefile.orig        Wed Oct  9 05:36:47 2002
+++ xforms-1.0RC5.2/image/Imakefile     Wed Oct  9 06:12:09 2002
@@ -79,16 +79,16 @@
 #endif
 
 EXTRA_INCLUDES = \
-                 $(XPMINCDIR) \
-                 $(TIFFINCDIR) \
-                 $(JPEGINCDIR) \
                  -I$(BUILDINCDIR) \
                  -I$(TOP)/lib \
                  -I$(TOP)/lib/private \
-                 -I.
+                 -I. \
+                 $(XPMINCDIR) \
+                 $(TIFFINCDIR) \
+                 $(JPEGINCDIR) 
 
 DEPEND_DEFINES = \
-                 -I/usr/local/include
+                 
 
 EXTRA_DEFINES  = \
                  $(HAVE_STRERROR )
@@ -115,13 +115,13 @@
 #endif
 
 #if defined( PpcDarwinArchitecture )
-SHLIBLDFLAGS   += -lSystem -lcc_dynamic
+SHLIBLDFLAGS   += -lSystem -lcc_dynamic -flat_namespace -undefined suppress
 #endif
 
 REQUIREDLIBS   = \
                  $(LDPRELIB) \
                  $(XLIB) \
-                 -L/usr/local/lib \
+                  \
                  -L../lib -lforms \
                  $(JPEGLIBDIR) -ljpeg \
                  $(TIFFLIBDIR) -ltiff \



-------------------------------------------------------
This SF.net email is sponsored by: ApacheCon, November 18-21 in
Las Vegas (supported by COMDEX), the only Apache event to be
fully supported by the ASF. http://www.apachecon.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to