Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13241/10.4-transitional/unstable/main/finkinfo/libs

Modified Files:
        gle3.info gle3.patch 
Log Message:
Sync with 10.3: Cleaner .patch; libtool fixes; improved path handling during 
build.



Index: gle3.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/gle3.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gle3.info   27 Apr 2005 03:26:02 -0000      1.1
+++ gle3.info   17 Jul 2005 08:08:10 -0000      1.2
@@ -1,6 +1,6 @@
 Package: gle3
 Version: 3.1.0
-Revision: 14
+Revision: 15
 Description: GLE tubing and extrusion library
 DescDetail: <<
 GLE is a library package of C functions that draw
@@ -37,21 +37,22 @@
 BuildDependsOnly: True
 Source: mirror:sourceforge:gle/gle-%v.tar.gz
 Source-MD5: da5b45c6906343d4a3672c3de35513ad
+Patch: %n.patch
 PatchScript: <<
-  sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
   perl -pi.bak -e 's/^#include <malloc.h>/#include <stdlib.h>/' `grep -l -r 
malloc.h .`
-  perl -pi.bak -e 's/-pedantic//g' `find . -name Makefile.in`
+  perl -pi.bak -e 's|/doc/gle/|/doc/%n/|' `find . -name Makefile.in`
+  perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
 <<
-ConfigureParams: --mandir=%i/share/man
+ConfigureParams: --mandir=%p/share/man --x-includes=/usr/X11R6/include
 #SetLDFLAGS: -framework OpenGL
+SetLIBS: -L%p/lib
 CompileScript: <<
   ./configure %c
   perl -pi.bak -e 's,-undefined suppress,,g; s,-flat_namespace,,g' libtool
   make
 <<
 InstallScript: <<
-  make install prefix=%i
-  mv %i/share/doc/gle %i/share/doc/gle3
+  make install DESTDIR=%d
   rm %i/share/doc/gle3/gle-3.0.lsm
 <<
 # 'make install' takes care of most of the doc files (for the main package)
@@ -59,7 +60,7 @@
 SplitOff: <<
   Package: %N-shlibs
   Description: GLE tubing and extrusion library (runtime code)
-  Depends: x11, glut
+  Depends: x11, glut-shlibs
   Files: lib/libgle.*.dylib
   Shlibs: %p/lib/libgle.3.dylib 5.0.0 gle3-shlibs (>= 3.1.0-13)
   DocFiles: AUTHORS COPYING doc/COPYING.artistic src/COPYING.src README

Index: gle3.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/gle3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gle3.patch  27 Apr 2005 03:26:02 -0000      1.1
+++ gle3.patch  17 Jul 2005 08:08:10 -0000      1.2
@@ -1,12 +1,21 @@
 diff -Nurd -x'*~' gle-3.1.0.orig/src/Makefile.in gle-3.1.0/src/Makefile.in
 --- gle-3.1.0.orig/src/Makefile.in     2004-06-14 01:35:08.000000000 -0400
 +++ gle-3.1.0/src/Makefile.in  2004-06-14 01:35:36.000000000 -0400
+@@ -97,7 +97,7 @@
+ INCLUDES =    @X_CFLAGS@
+ 
+ 
+-CFLAGS = @CFLAGS@ -Wall -pedantic -Wstrict-prototypes  -Wconversion
++CFLAGS = @CFLAGS@ -Wall  -Wstrict-prototypes  -Wconversion
+ 
+ docdir = $(datadir)/doc/gle/
+ 
 @@ -219,7 +219,7 @@
  maintainer-clean-libtool:
  
  libgle.la: $(libgle_la_OBJECTS) $(libgle_la_DEPENDENCIES)
 -      $(LINK) -rpath $(libdir) $(libgle_la_LDFLAGS) $(libgle_la_OBJECTS) 
$(libgle_la_LIBADD) $(LIBS)
-+      $(LINK) -rpath $(libdir) $(libgle_la_LDFLAGS) $(libgle_la_OBJECTS) 
$(libgle_la_LIBADD) $(LIBS) [EMAIL PROTECTED]@/lib -lglut -lXi -lXext -lXmu 
-lGLU -lGL -L/usr/X11R6/lib -lXt -lX11
++      $(LINK) -rpath $(libdir) $(libgle_la_LDFLAGS) $(libgle_la_OBJECTS) 
$(libgle_la_LIBADD) $(LIBS) -lglut -lXi -lXext -lXmu -lGLU -lGL 
-L/usr/X11R6/lib -lXt -lX11
  
  install-GLDATA: $(GL_DATA)
        @$(NORMAL_INSTALL)



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to