Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/x11
In directory usw-pr-cvs1:/tmp/cvs-serv22339

Added Files:
        sunclock-3.46-2.info sunclock-3.46-2.patch 
Removed Files:
        sunclock-3.46-1.info sunclock-3.46-1.patch 
Log Message:
Change order of LDFLAGS so non-fink Xpm is used


--- NEW FILE: sunclock-3.46-2.info ---
Package: sunclock 
Version: 3.46
Revision: 2
Maintainer: Ben Hines <[EMAIL PROTECTED]> 
Depends: x11, libjpeg-shlibs
BuildDepends: libjpeg
Source: ftp://ftp.ac-grenoble.fr/ge/geosciences/%n-%v.tgz
Source-MD5: e9156acaf779db200136914d857079c7
Patch: %f.patch
CompileScript: <<
make -f Makefile.noimake EXTRA_CFLAGS=-I%p/include EXTRA_LDFLAGS=-L%p/lib 
SHAREDIR=%p/share/%n
<<
Installscript: <<
mkdir -p %i/share/man/man1
make -f Makefile.noimake install XBINDIR=%p/bin MANDIR=%p/share/man/man1 DESTDIR=%d 
SHAREDIR=%p/share/%n
<<
DocFiles: CHANGES COPYING INSTALL README TODO WARNING VMF.txt
Description: Sophisticated world clock for X11.
DescDetail: <<
Sunclock displays a map of the Earth and shows which portion is illuminated by the 
sun. 
In addition to providing local time for the default timezone, it also displays GMT 
time,
legal and solar time of major cities, their latitude and longitude, sunrise and sunset,
and the mutual distances of arbitrary locations on Earth. 
Sunclock can display meridians, parallels, tropics, and arctic circles. 
It has builtin functions that accelerate the speed of time and show the evolution of 
seasons.
<<
DescUsage: <<
Downloading the enhanced earth maps is reccomended. Set options in ~/.sunclockrc.
See manpage for list.
<<
Homepage: http://frmas.free.fr/li_1.htm
License: GPL

--- NEW FILE: sunclock-3.46-2.patch ---
--- sunclock-3.46/Makefile.noimake      Wed Jun 27 08:33:26 2001
+++ sunclock-3.46-patched/Makefile.noimake      Wed May 29 15:37:06 2002
@@ -29,12 +29,16 @@
 #LFLAGS=-L/usr/openwin/lib
 
 # For OpenServer
-CFLAGS=-I/usr/include/X11 -DMAXPATHLEN=1024 -O -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)"
-LFLAGS=-L/usr/lib/X11 -lXpm -ljpeg -lsocket
+#CFLAGS=-I/usr/include/X11 -DMAXPATHLEN=1024 -O -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)"
+#LFLAGS=-L/usr/lib/X11 -lXpm -ljpeg -lsocket
 
 # For Linux
-CFLAGS=-I/usr/include/X11 -O -Wall -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-LFLAGS=-L/usr/X11/lib -lXpm -ljpeg
+#CFLAGS=-I/usr/include/X11 -O -Wall -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+#LFLAGS=-L/usr/X11/lib -lXpm -ljpeg
+
+# For Darwin
+CFLAGS = -I/usr/X11R6/include -O -Wall -DNEW_CTIME -DNO_MALLOC_H 
+-DSHAREDIR=\"$(SHAREDIR)\" $(EXTRA_CFLAGS) 
+LFLAGS =-L/usr/X11R6/lib -lXpm -ljpeg $(EXTRA_LDFLAGS) 
 
 OFILES=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
        readjpeg.o readvmf.o readxpm.o
@@ -61,7 +65,7 @@
        cat WARNING
 
 install.man:
-       cp -f sunclock.man $(DESTDIR)$(MANDIR)/sunclock.1x
+       cp -f sunclock.man $(DESTDIR)$(MANDIR)/sunclock.man
        if [ -r $(DESTDIR)$(MANDIR)/sunclock.1x.gz ] ; \
           then gzip -f $(DESTDIR)$(MANDIR)/sunclock.1x ; fi
 
--- sunclock-3.46/sunclock.c    Wed Jul  4 14:27:14 2001
+++ sunclock-3.46-patched/sunclock.c    Wed May 29 15:51:25 2002
@@ -2178,7 +2178,7 @@
         char            s[128];
         char            slat[20], slon[20], slatp[20], slonp[20];
         double          dist;
-#ifdef NEW_CTIME
+#if 0
         struct timeb            tp;
 
         if (ftime(&tp) == -1) {
--- sunclock-3.46/tildepath.c   Fri Sep  1 08:34:51 2000
+++ sunclock-3.46-patched/tildepath.c   Wed May 29 15:18:41 2002
@@ -38,7 +38,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <pwd.h>
+#ifndef NO_MALLOC_H
 #include <malloc.h>
+#endif
 #include <string.h>
 
 /*

--- sunclock-3.46-1.info DELETED ---

--- sunclock-3.46-1.patch DELETED ---



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to