[gentoo-commits] gentoo-x86 commit in x11-plugins/wmSpaceWeather/files: wmSpaceWeather-1.04_p19-gentoo.patch wmSpaceWeather-1.04_p19-getkp.patch

[gentoo-commits] gentoo-x86 commit in x11-plugins/wmSpaceWeather/files: wmSpaceWeather-1.04_p19-gentoo.patch wmSpaceWeather-1.04_p19-getkp.patch

[Michele Noberasco (s4t4n)]

s4t4n       08/02/01 14:00:24

  Added:                wmSpaceWeather-1.04_p19-gentoo.patch
                        wmSpaceWeather-1.04_p19-getkp.patch
  Log:
  Revision bump, with lots of fixes (see CL). Closes bug #207888.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch?rev=1.1&content-type=text/plain

Index: wmSpaceWeather-1.04_p19-gentoo.patch
===================================================================
--- wmSpaceWeather/Makefile.orig	2008-01-28 02:45:07.000000000 +0100
+++ wmSpaceWeather/Makefile	2008-01-28 02:46:04.000000000 +0100
@@ -1,8 +1,8 @@
-CC     = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
+CC     ?= gcc
+CFLAGS += -Wall
+INCDIR = -I/usr/include/X11
+PREFIX = /usr
+LIBDIR ?= /usr/lib
 # for linux
 LIBS   = -lXpm -lX11 -lXext
 # for Solaris
@@ -12,14 +12,14 @@
 
 
 .c.o:
-	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
 
 
 all:	wmSpaceWeather.o wmSpaceWeather
 
 wmSpaceWeather.o: wmSpaceWeather_master.xpm wmSpaceWeather_mask.xbm
 wmSpaceWeather:	$(OBJS) 
-	$(CC) $(COPTS) $(SYSTEM) -o wmSpaceWeather $^ $(INCDIR) $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) -o wmSpaceWeather $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
@@ -28,10 +28,10 @@
 	rm -f wmSpaceWeather
 
 install:: wmSpaceWeather
-	install -d $(DESTDIR)/usr/bin
-	install -d $(DESTDIR)/usr/share/wmspaceweather
-	install -d $(DESTDIR)/usr/share/man/man1 
-	install -m 0755 wmSpaceWeather $(DESTDIR)/usr/bin
-	install -m 0755 GetKp $(DESTDIR)/usr/share/wmspaceweather
-	install -m 0644 wmSpaceWeather.1 $(DESTDIR)/usr/share/man/man1 
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install -d $(DESTDIR)$(PREFIX)/share/wmspaceweather
+	install -d $(DESTDIR)$(PREFIX)/share/man/man1 
+	install -m 0755 wmSpaceWeather $(DESTDIR)$(PREFIX)/bin
+	install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather
+	install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1
 
--- wmSpaceWeather/wmSpaceWeather.c.orig	2008-01-28 03:16:36.000000000 +0100
+++ wmSpaceWeather/wmSpaceWeather.c	2008-01-28 03:22:12.000000000 +0100
@@ -663,7 +663,7 @@
     if (GotDoubleClick1) {
         GotFirstClick1 = 0;
         GotDoubleClick1 = 0;
-        sprintf(Command, "sensible-browser '%s' &", URL);
+	sprintf(Command, "firefox -remote 'openURL(%s)'", URL);
         system(Command);
     }
 



1.1                  x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch?rev=1.1&content-type=text/plain

Index: wmSpaceWeather-1.04_p19-getkp.patch
===================================================================
--- wmSpaceWeather/GetKp.orig	2008-01-28 14:20:43.000000000 +0100
+++ wmSpaceWeather/GetKp	2008-01-28 14:22:48.000000000 +0100
@@ -17,10 +17,10 @@
     unlink(CUR_INDEX);
 
 
-#   $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt";
+#   $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt";
 #   system "$grabcmd";
 #
-	$grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.sec.noaa.gov/ftpdir/indices/DGD.txt";
+	$grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt";
 	exit 1 if (system "$grabcmd");
 
 
@@ -69,9 +69,9 @@
     #
     # Add in very latest stuff
     #
-#   $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/latest/curind.txt";
+#   $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/latest/curind.txt";
 #   system "$grabcmd";
-	$grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.sec.noaa.gov/ftpdir/latest/curind.txt";
+	$grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.swpc.noaa.gov/ftpdir/latest/curind.txt";
 	exit 1 if (system "$grabcmd");
     %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12);
 



-- 
gentoo-commits@lists.gentoo.org mailing list