Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv26297

Added Files:
        xplanet.info xplanet.patch 
Log Message:
to 10.7 with version bump and redoing flag reordering after upstream changes 
with X_CFLAGS

--- NEW FILE: xplanet.patch ---
diff -ruN xplanet-1.2.2.orig/src/Makefile.in xplanet-1.2.2/src/Makefile.in
--- xplanet-1.2.2.orig/src/Makefile.in  2011-02-15 19:57:38.000000000 -0500
+++ xplanet-1.2.2/src/Makefile.in       2012-01-31 10:11:02.000000000 -0500
@@ -263,7 +263,7 @@
 SUBDIRS = libannotate libdisplay libephemeris libimage libmultiple libplanet 
libprojection libsgp4sdp4
 EXTRA_xplanet_SOURCES = ParseGeom.c ParseGeom.h
 @HAVE_LIBX11_FALSE@parsegeom = ParseGeom.c ParseGeom.h
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)@separator@xplanet\" @X_CFLAGS@ 
@FREETYPE_CFLAGS@ 
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)@separator@xplanet\" @FREETYPE_CFLAGS@ 
@X_CFLAGS@ 
 AM_LDFLAGS = @xplanet_LDFLAGS@
 xplanet_SOURCES = \
        Map.cpp                 \
diff -ruN xplanet-1.2.2.orig/src/libdisplay/Makefile.in 
xplanet-1.2.2/src/libdisplay/Makefile.in
--- xplanet-1.2.2.orig/src/libdisplay/Makefile.in       2011-02-15 
19:57:38.000000000 -0500
+++ xplanet-1.2.2/src/libdisplay/Makefile.in    2012-01-31 10:08:30.000000000 
-0500
@@ -235,7 +235,7 @@
 @HAVE_LIBX11_TRUE@displayx11 = DisplayX11.cpp DisplayX11.h vroot.h 
 @HAVE_LIBX11_TRUE@timerx11 = TimerX11.h TimerX11.cpp
 EXTRA_libdisplay_a_SOURCES = DisplayMacAqua.cpp DisplayMacAqua.h 
DisplayMSWin.cpp DisplayMSWin.h TextRendererFT2.cpp TextRendererFT2.h 
TextRendererPangoFT2.cpp TextRendererPangoFT2.h DisplayX11.cpp DisplayX11.h 
vroot.h TimerMacAqua.cpp TimerMacAqua.h TimerX11.cpp TimerX11.h
-AM_CPPFLAGS = -I@top_srcdir@/src @X_CFLAGS@ @FREETYPE_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/src @FREETYPE_CFLAGS@ @X_CFLAGS@
 @USE_AR_FALSE@libdisplay_a_AR = $(CXX) @xplanet_ARFLAGS@
 @USE_AR_TRUE@libdisplay_a_AR = $(AR) cru
 @USE_AR_FALSE@libtimer_a_AR = $(CXX) @xplanet_ARFLAGS@
diff -ruN xplanet-1.2.2.orig/src/libimage/Makefile.in 
xplanet-1.2.2/src/libimage/Makefile.in
--- xplanet-1.2.2.orig/src/libimage/Makefile.in 2011-02-15 19:57:38.000000000 
-0500
+++ xplanet-1.2.2/src/libimage/Makefile.in      2012-01-31 10:14:21.000000000 
-0500
@@ -218,7 +218,7 @@
 @HAVE_LIBPNM_TRUE@pnm = pnm.c
 @HAVE_LIBTIFF_TRUE@tiff = tiff.c
 EXTRA_libimage_a_SOURCES = bmp.c gif.c jpeg.c png.c pnm.c tiff.c ReadImage.cpp 
WriteImage.cpp
-AM_CPPFLAGS = -I@top_srcdir@/src
+AM_CPPFLAGS = -I@top_srcdir@/src @FREETYPE_CFLAGS@
 @USE_AR_FALSE@libdisplay_a_AR = $(CXX) @xplanet_ARFLAGS@
 @USE_AR_TRUE@libdisplay_a_AR = $(AR) cru
 @USE_AR_FALSE@libtimer_a_AR = $(CXX) @xplanet_ARFLAGS@

--- NEW FILE: xplanet.info ---
Package: xplanet
Version: 1.2.2
Revision: 2
Description: Earth and planet renderer
License: GPL
Maintainer: Benjamin Reed <xpla...@fink.raccoonfink.com>

Depends: <<
        freeglut-shlibs,
        giflib-shlibs,
        libgettext8-shlibs,
        libiconv,
        netpbm10-shlibs,
        pango1-xft2-ft219-shlibs (>= 1.24.0-1),
        x11
<<
BuildDepends: <<
        cairo (>= 1.8.8-1),
        expat1,
        fink (>= 0.29.7-1),
        fink-package-precedence,
        fontconfig2-dev (>= 2.4.1-1),
        freeglut,
        freetype219 (>= 2.3.7-7),
        giflib,
        glib2-dev (>= 2.18.4-1),
        glitz,
        libgettext8-dev,
        libiconv-dev,
        libjpeg8,
        libpng15,
        libtiff,
        netpbm10,
        pango1-xft2-ft219-dev (>= 1.24.0-1),
        pixman (>= 0.16.0-1),
        pkgconfig (>= 0.23-1),
        x11-dev,
        xft2-dev
<<
GCC: 4.0

Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: b38c3b4cfdd772643f876a9bb15f288b
PatchFile: %n.patch
PatchFile-MD5: 726f83d5c583e7ee1964b203be4c09b1

SetCPPFLAGS: -Wall
ConfigureParams: <<
        --mandir=%p/share/man \
        --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
        --with-x --with-xscreensaver \
        --with-freetype --with-pango \
        --without-cspice \
        --with-aqua \
        --with-gif --with-jpeg --with-png --with-pnm --with-tiff \
        --enable-dependency-tracking
<<

InstallScript: <<
        fink-package-precedence .
        make -j1 install DESTDIR=%d
<<
DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO

Homepage: http://xplanet.sourceforge.net
DescDetail: <<
Xplanet is similar to Xearth, where an image of the earth is rendered 
into an X window.  Xplanet can display several different map 
projections, including Azimuthal, Mercator, Mollweide, orthographic, 
or rectangular, as well as a window with a globe the user can rotate 
interactively.  The other planets and some satellites may also be 
displayed.  The latest version can always be found at 
http://xplanet.sourceforge.net. Versions after 0.95 lack the -animate 
and other commands. If you prefer to install version 0.95, type 
"fink install xplanet-0.95".
<<
DescUsage: <<
A man page is available. Also see %p/share/doc/%n/README. Configuration 
options are documented in %p/share/doc/%n/README.config. Those using 
xplanet as part of a screensaver and/or upgrading from a previous 
version of xplanet should read the NEWS file. Many critical things have 
changed, including settings for use with xscreensaver.
<<
DescPackaging: <<
Builds with support for x11, openGL and aqua (see 
http://xplanet.sourceforge.net/OSX/). Added support for x screensaver 
module.

Have to disable quicktime on OS X to avoid libstdc++ linking mess.
Previously maintained by James Gibbs.

dmacks fixed -I ordering. See:
http://xplanet.sourceforge.net/FUDforum2/index.php?t=msg&th=558
<<
DescPort: <<
signbit() hack stolen from FreeBSD. It's in libSystem and appears to
be in cmath, not sure why compiler can't find its prototype.
<<



------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to