Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29571/main/finkinfo/x11
Modified Files:
freeglut.info glut.info sunclock.info sunclock.patch
Log Message:
sync from 10.3 distro
Index: glut.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/glut.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glut.info 27 Apr 2005 03:26:59 -0000 1.1
+++ glut.info 29 Apr 2005 00:22:09 -0000 1.2
@@ -1,12 +1,15 @@
Package: glut
Version: 3.7
-Revision: 23
+Revision: 24
GCC: 3.3
Maintainer: None <fink-devel@lists.sourceforge.net>
Source: http://www.opengl.org/developers/documentation/%N/%N-%v.tar.gz
Source-MD5: dc932666e2a1c8a0b148a4c32d111ef3
-Depends: %N-shlibs
+Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.9.9), x11-dev
+BuildConflicts: freeglut
+Conflicts: freeglut
+Replaces: freeglut
Patch: %n.patch
CompileScript: <<
(cd include/GL; cp glut.h %b/lib/%N/)
Index: sunclock.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/sunclock.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sunclock.info 27 Apr 2005 03:26:59 -0000 1.1
+++ sunclock.info 29 Apr 2005 00:22:09 -0000 1.2
@@ -1,6 +1,6 @@
Package: sunclock
Version: 3.53
-Revision: 2
+Revision: 3
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Depends: x11, libjpeg-shlibs, libpng3-shlibs
BuildDepends: libjpeg, x11-dev, libpng3
Index: sunclock.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/sunclock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sunclock.patch 27 Apr 2005 03:26:59 -0000 1.1
+++ sunclock.patch 29 Apr 2005 00:22:09 -0000 1.2
@@ -47,3 +47,14 @@
if [ -r $(DESTDIR)$(MANDIR)/sunclock.1x.gz ] ; \
then gzip -f $(DESTDIR)$(MANDIR)/sunclock.1x ; fi
+--- sunclock-3.53/sunclock.h.orig 2005-04-25 18:42:44.000000000 -0700
++++ sunclock-3.53/sunclock.h 2005-04-25 18:44:11.000000000 -0700
+@@ -18,7 +18,7 @@
+ #include <time.h>
+ #include "version.h"
+
+-#define HELPCOMMAND "x-terminal-emulator -e man sunclock &"
++#define HELPCOMMAND "xterm -e man sunclock &"
+ #define FAILFONT "fixed"
+
+ /* num of bitmaps to accomodate 1 mark and 2 spatial objets (Sun, Moon) */
Index: freeglut.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/freeglut.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freeglut.info 27 Apr 2005 03:26:59 -0000 1.1
+++ freeglut.info 29 Apr 2005 00:22:09 -0000 1.2
@@ -1,27 +1,33 @@
Package: freeglut
Version: 2.2.0
-Revision: 1
+Revision: 2
GCC: 3.3
Maintainer: Jack Howarth <[EMAIL PROTECTED]>
Source: mirror:sourceforge:freeglut/%N-%v.tar.gz
Source-MD5: 9439b8745f443131c2dad00bc93dc0ef
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.9.9), x11-dev
+BuildConflicts: glut
Conflicts: glut
Replaces: glut
-Provides: glut (=3.8)
+ConfigureParams: --disable-replace-glut
SetCFLAGS: -O3
SetLDFLAGS: -L%b/src/.libs
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
BuildDependsOnly: True
+InstallScript: <<
+make install DESTDIR=%d
+ln -s libfreeglut.3.dylib %i/lib/libglut.dylib
+ln -s libfreeglut.a %i/lib/libglut.a
+ln -s freeglut.h %i/include/GL/glut.h
+ln -s freeglut_ext.h %i/include/GL/glut_ext.h
+ln -s freeglut_std.h %i/include/GL/glut_std.h
+<<
SplitOff: <<
Package: %N-shlibs
Depends: libgl
- Conflicts: glut-shlibs
- Replaces: glut-shlibs
- Provides: glut-shlibs (=3.8)
- Files: lib/lib*.*.dylib
- Shlibs: %p/lib/libglut.3.dylib 12.0.0 %n (>= 2.2.0-1)
+ Files: lib/libfreeglut.3.8.0.dylib lib/libfreeglut.3.dylib
+ Shlibs: %p/lib/libfreeglut.3.dylib 12.0.0 %n (>= 2.2.0-1)
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
<<
Description: Opengl utility toolkit
@@ -36,10 +42,17 @@
it with freeglut.
<<
DescPackaging: <<
-This package is binary compatible with glut/glut-shlibs and can substitute
-for them. Unfortunately I see no way to allow packages that currently
-depend on a specific version of glut-shlibs to be upgraded without
-changing those packages to have "Depends: glut-shlibs|freeglut-shlibs".
+This package is NOT binary compatible with glut/glut-shlibs and can not
+replace for them. Packages that wish to use freeglut as a replacement
+for glut need to have "BuildDepends: glut|freeglut" and "Depends:
+glut-shlibs|freeglut-shlibs" in their info file.
+
+This package builds the freeglut libraries named as freeglut rather than
+glut to allow the co-existance with glut since the shared library versioning
+is identical. I have adopted the use of symlinks for the libraries and
+headers to allow freeglut to used as a drop in replace for glut without
+requiring changes in the source code of programs which require glut.
+
Note that I have used the LDFLAGS to prevent freeglut from linking its
demo programs against the installed libglut.
<<
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
