Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs17:/tmp/cvs-serv21313/10.3/unstable/main/finkinfo/graphics
Modified Files:
antiprism.info
Added Files:
antiprism.patch
Log Message:
Fix upstream failure to link libGLU, avoid filename collision with gmt package
--- NEW FILE: antiprism.patch ---
diff -Nurd -x'*`' antiprism-0.14.orig/Makefile.in antiprism-0.14/Makefile.in
--- antiprism-0.14.orig/Makefile.in 2007-06-20 04:07:13.000000000 -0400
+++ antiprism-0.14/Makefile.in 2007-06-22 14:53:12.000000000 -0400
@@ -168,8 +168,8 @@
EXTRA_DIST = bootstrap doc Makefile_basic base/Makefile_basic \
src/Makefile_basic aview/Makefile_basic
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-doc_DATA = README NEWS AUTHORS
+docdir = $(prefix)/share/doc/$(PACKAGE)
+doc_DATA = README NEWS AUTHORS COPYING
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -Nurd -x'*`' antiprism-0.14.orig/configure antiprism-0.14/configure
--- antiprism-0.14.orig/configure 2007-06-20 04:07:14.000000000 -0400
+++ antiprism-0.14/configure 2007-06-22 14:47:58.000000000 -0400
@@ -3910,7 +3910,7 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
echo "${ECHO_T}$ac_cv_lib_GLU_gluBeginCurve" >&6
if test $ac_cv_lib_GLU_gluBeginCurve = yes; then
- LIBS="-lGL $LIBS"
+ LIBS="-lGLU $LIBS"
else
diff -Nurd -x'*`' antiprism-0.14.orig/src/minmax.cc antiprism-0.14/src/minmax.cc
--- antiprism-0.14.orig/src/minmax.cc 2007-02-08 09:27:17.000000000 -0500
+++ antiprism-0.14/src/minmax.cc 2007-06-22 15:10:36.000000000 -0400
@@ -53,7 +53,7 @@
string ifile;
string ofile;
- mm_opts(): prog_opts("minmax"), num_iters(1000), algm('a'),
+ mm_opts(): prog_opts("minmax-antiprism"), num_iters(1000), algm('a'),
placement('n'), shorten_by(1.0), lengthen_by(0.0)
{}
Index: antiprism.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/antiprism.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- antiprism.info 21 Jun 2007 19:54:30 -0000 1.1
+++ antiprism.info 22 Jun 2007 20:11:21 -0000 1.2
@@ -1,15 +1,19 @@
Package: antiprism
Version: 0.14
-Revision: 1
+Revision: 2
-BuildDepends: freeglut, x11-dev
-Depends: freeglut-shlibs, x11
+BuildDepends: freeglut (>= 2.4.0-2), x11-dev
+Depends: freeglut-shlibs (>= 2.4.0-2), x11
GCC: 3.3
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: e92a37ed26b65ab9c195c2df4678f0e0
-PatchScript: perl -pi -e 's/-\$\(VERSION\)// if /docdir/' Makefile.in
+Patch: %n.patch
+PatchScript: <<
+ perl -pi -e 's/minmax/minmax-%n/g' doc/*.html NEWS
+ mv doc/minmax.html doc/minmax-%n.html
+<<
SetCPPFLAGS: -I/usr/X11R6/include
SetLDFLAGS: -L/usr/X11R6/lib
@@ -17,10 +21,22 @@
SetCXXFLAGS: -g -Os -Wall
ConfigureParams: --disable-dependency-tracking
-DocFiles: COPYING
+InstallScript: <<
+ make install DESTDIR=%d
+ mv %i/bin/minmax %i/bin/minmax-%n
+<<
DescPackaging: <<
Make sure all doc files wind up in consistent location.
+
+ Need versioned freeglut dep to ensure libglut.la is present in
+ case %n ever gets libtoolized.
+
+ Rename the %p/bin/minmax command to "minmax-%n" to avoid
+ collision with same command-name in gmt package.
+<<
+DescPort: <<
+ Fix libGLU detection bug (avoid indirect symbol use).
<<
Description: Polyhedra manipulations and viewing
License: BSD
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
