Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv28153/10.4/stable/main/finkinfo/sci
Added Files:
octplot.info octplot.patch
Log Message:
Move to stable.
-aqua variant won't build on 10.7/10.8.
--- NEW FILE: octplot.patch ---
diff -Naur octplot-0.4.0/fonts/Makefile.in
octplot-0.4.0.patched/fonts/Makefile.in
--- octplot-0.4.0/fonts/Makefile.in 2007-04-25 02:33:01.000000000 +0900
+++ octplot-0.4.0.patched/fonts/Makefile.in 2007-11-04 20:06:03.000000000
+0900
@@ -194,7 +194,7 @@
uninstall-info-am:
install-dist_fontDATA: $(dist_font_DATA)
@$(NORMAL_INSTALL)
- test -z "$(fontdir)" || $(mkdir_p) "$(DESTDIR)$(fontdir)"
+ test -z "$(DESTDIR)$(fontdir)" || $(mkdir_p) "$(DESTDIR)$(fontdir)"
@list='$(dist_font_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
diff -Naur octplot-0.4.0/high_level/Makefile.in
octplot-0.4.0.patched/high_level/Makefile.in
--- octplot-0.4.0/high_level/Makefile.in 2007-04-27 19:46:29.000000000
+0900
+++ octplot-0.4.0.patched/high_level/Makefile.in 2007-11-04
20:10:44.000000000 +0900
@@ -212,7 +212,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-destinationSCRIPTS: $(destination_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(destinationdir)" || $(mkdir_p) "$(DESTDIR)$(destinationdir)"
+ test -z "$(DESTDIR)$(destinationdir)" || $(mkdir_p)
"$(DESTDIR)$(destinationdir)"
@list='$(destination_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -232,7 +232,7 @@
uninstall-info-am:
install-dist_octplotmDATA: $(dist_octplotm_DATA)
@$(NORMAL_INSTALL)
- test -z "$(octplotmdir)" || $(mkdir_p) "$(DESTDIR)$(octplotmdir)"
+ test -z "$(DESTDIR)$(octplotmdir)" || $(mkdir_p)
"$(DESTDIR)$(octplotmdir)"
@list='$(dist_octplotm_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
diff -Naur octplot-0.4.0/src/Makefile.in octplot-0.4.0.patched/src/Makefile.in
--- octplot-0.4.0/src/Makefile.in 2007-04-27 19:46:33.000000000 +0900
+++ octplot-0.4.0.patched/src/Makefile.in 2007-11-04 20:09:51.000000000
+0900
@@ -320,7 +320,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-destinationPROGRAMS: $(destination_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(destinationdir)" || $(mkdir_p) "$(DESTDIR)$(destinationdir)"
+ test -z "$(DESTDIR)$(destinationdir)" || $(mkdir_p)
"$(DESTDIR)$(destinationdir)"
@list='$(destination_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -346,7 +346,7 @@
$(CXXLINK) $(octplot_LDFLAGS) $(octplot_OBJECTS) $(octplot_LDADD)
$(LIBS)
install-destinationSCRIPTS: $(destination_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(destinationdir)" || $(mkdir_p) "$(DESTDIR)$(destinationdir)"
+ test -z "$(DESTDIR)$(destinationdir)" || $(mkdir_p)
"$(DESTDIR)$(destinationdir)"
@list='$(destination_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -1152,7 +1152,7 @@
uninstall-info-am:
install-dist_octplotmDATA: $(dist_octplotm_DATA)
@$(NORMAL_INSTALL)
- test -z "$(octplotmdir)" || $(mkdir_p) "$(DESTDIR)$(octplotmdir)"
+ test -z "$(DESTDIR)$(octplotmdir)" || $(mkdir_p)
"$(DESTDIR)$(octplotmdir)"
@list='$(dist_octplotm_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -1169,7 +1169,7 @@
done
install-mpathDATA: $(mpath_DATA)
@$(NORMAL_INSTALL)
- test -z "$(mpathdir)" || $(mkdir_p) "$(DESTDIR)$(mpathdir)"
+ test -z "$(DESTDIR)$(mpathdir)" || $(mkdir_p) "$(DESTDIR)$(mpathdir)"
@list='$(mpath_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -1186,7 +1186,7 @@
done
install-nodist_octplotmDATA: $(nodist_octplotm_DATA)
@$(NORMAL_INSTALL)
- test -z "$(octplotmdir)" || $(mkdir_p) "$(DESTDIR)$(octplotmdir)"
+ test -z "$(DESTDIR)$(octplotmdir)" || $(mkdir_p)
"$(DESTDIR)$(octplotmdir)"
@list='$(nodist_octplotm_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
diff -Naur octplot-0.4.0/src/glutesscb.h octplot-0.4.0.patched/src/glutesscb.h
--- octplot-0.4.0/src/glutesscb.h 2007-04-12 10:50:07.000000000 -0700
+++ octplot-0.4.0.patched/src/glutesscb.h 2008-05-26 16:55:45.000000000
-0700
@@ -20,7 +20,7 @@
// Taken from FTGL/FTVectoriser.cpp
#ifdef __APPLE_CC__
- typedef GLvoid (*GLUTesselatorFunction)(...);
+ typedef GLvoid (*GLUTesselatorFunction)();
#elif defined ( WIN32)
typedef GLvoid (CALLBACK *GLUTesselatorFunction)( );
#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) ||
defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) ||
defined(__GLIBC__)
--- NEW FILE: octplot.info ---
Info2: <<
Package: octplot%type_pkg[-aqua]
Version: 0.4.0
Revision: 12
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Description: Handle graphics package for Octave
Homepage: http://octplot.sourceforge.net
License: GPL
# Build parameters
Type: -aqua (-aqua -x11)
GCC: 4.0
Source: mirror:sourceforge:%{ni}/%{ni}-%v.tar.gz
Source-MD5: 1ea6fa85b620e6af252ee64407c87285
PatchFile: %{ni}.patch
PatchFile-MD5: fd54d1b2183f0ddf4da64d65fb45b2e2
PatchScript: <<
#!/bin/sh -ev
%{default_script}
perl -pi -e 's|Fl/|FL/|g' src/*.cpp
perl -pi -e 's|GL/|OpenGL/|g' src/patch.cpp
perl -pi -e "s,use-gl --libs,use-gl --libs | tr \'\\\n\' \' \'," configure
<<
Depends: <<
octave305-interpreter,
freetype219-shlibs,
(%type_pkg[-aqua] = -x11) fltk-x11-shlibs,
(%type_pkg[-aqua] = -aqua) fltk-aqua-shlibs,
ghostscript | ghostscript-nox,
fink-package-precedence
<<
BuildDepends: <<
liboctave305-dev,
freetype219, hdf5.7-oldapi, fftw3, libncurses5, readline6,
(%type_pkg[-aqua] = -x11) fltk-x11,
(%type_pkg[-aqua] = -aqua) fltk-aqua,
fink ( >= 0.24.12-1 )
<<
Conflicts: octplot-aqua,octplot-x11
Replaces: octplot-aqua,octplot-x11
ConfigureParams: --with-ft-prefix=%p/lib/freetype219
SetLDFLAGS: -L%p/opt/hdf5v1.6/lib
SetCPPFLAGS: -I%p/opt/hdf5v1.6/include
CompileScript: <<
#!/bin/sh -ev
if [ "%type_pkg[-aqua]" == "-x11" ]
then export GL_SWAP_TYPE=COPY
fi
install_sh=/usr/bin/install ./configure %c
make
fink-package-precedence .
<<
#deb-time stuff
InstallScript: <<
make install DESTDIR=%d
install -d %i/share/%n/demos
install demos/*.m %i/share/%n/demos
<<
PostInstScript: <<
if [ "%type_pkg[-aqua]" == "-aqua" ] ; then
pushd %p/lib/octave
fltk-config.aqua --post $(/usr/bin/find * | grep octplot$)
popd
fi
<<
DocFiles: COPYING AUTHORS ChangeLog NEWS README README.mac
DescPackaging: <<
Includes some demo scripts.
Currently relying on implicit Depends via octave.
Depends on a particular octave version because it installs
in an octave-versioned directory.
<<
DescPort: <<
Patch out wrongly-cased FL include directory references.
Uses system OpenGL framework, even for the -x11 variant
(it didn't like X11's for some reason).
PostInstScript required for the Aqua variant to work properly.
Sets GL_SWAP_TYPE=COPY in the -x11 compile script so that selection
of a plot area to zoom works properly.
<<
DescUsage: <<
Run
toggle_octplot
from an octave prompt to turn octplot on and off.
<<
<<
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
