Date: Fri, 4 Apr 2014 19:57:17 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350161 - in head/astro/wmspaceweather: . files Message-ID: <201404041957.s34JvHdl065153@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Apr 4 19:57:17 2014 New Revision: 350161 URL: http://svnweb.freebsd.org/changeset/ports/350161 QAT: https://qat.redports.org/buildarchive/r350161/ Log: Support stage Regenerate patches with a proper name Fix shebang Added: head/astro/wmspaceweather/files/patch-GetKp (contents, props changed) head/astro/wmspaceweather/files/patch-Makefile (contents, props changed) Modified: head/astro/wmspaceweather/Makefile head/astro/wmspaceweather/files/patch-wmSpaceWeather.c Modified: head/astro/wmspaceweather/Makefile ============================================================================== --- head/astro/wmspaceweather/Makefile Fri Apr 4 19:56:17 2014 (r350160) +++ head/astro/wmspaceweather/Makefile Fri Apr 4 19:57:17 2014 (r350161) @@ -3,7 +3,7 @@ PORTNAME= wmspaceweather PORTVERSION= 1.04 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro windowmaker MASTER_SITES= https://api.opensuse.org/public/source/openSUSE:Factory/WindowMaker-applets/ \ ftp://ftp.canadatux.org/linux/windowmaker/ @@ -18,13 +18,13 @@ RUN_DEPENDS= p5-Time-modules>=0:${PORTSD WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather -NO_STAGE= yes +USES= shebangfix +SHEBANG_FILES= GetKp USE_XORG= x11 xext xpm ALL_TARGET= clean all MAKE_JOBS_UNSAFE= yes -MAN1= wmSpaceWeather.1 - -PLIST_FILES= bin/GetKp bin/wmSpaceWeather +PLIST_FILES= bin/GetKp bin/wmSpaceWeather \ + man/man1/wmSpaceWeather.1.gz .include <bsd.port.mk> Added: head/astro/wmspaceweather/files/patch-GetKp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/wmspaceweather/files/patch-GetKp Fri Apr 4 19:57:17 2014 (r350161) @@ -0,0 +1,29 @@ +--- ./GetKp.orig 1999-02-12 06:42:01.000000000 +0100 ++++ ./GetKp 2014-04-04 21:55:15.059689500 +0200 +@@ -5,7 +5,7 @@ + # + + +- require "ctime.pl"; ++ use Time::CTime; + + + ($Year, $Month, $Day) = &year_month_day(); +@@ -19,7 +19,7 @@ + } + + +- $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt"; ++ $grabcmd = "cd /tmp; fetch -q ftp://ftp.sec.noaa.gov/pub/indices/DGD.txt"; + system "$grabcmd"; + + +@@ -68,7 +68,7 @@ + # + # Add in very latest stuff + # +- $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/latest/curind.txt"; ++ $grabcmd = "cd /tmp; fetch -q ftp://ftp.sec.noaa.gov/pub/latest/curind.txt"; + 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); + Added: head/astro/wmspaceweather/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/wmspaceweather/files/patch-Makefile Fri Apr 4 19:57:17 2014 (r350161) @@ -0,0 +1,43 @@ +--- ./Makefile.orig 1999-01-04 22:20:45.000000000 +0100 ++++ ./Makefile 2014-04-04 21:55:35.196529518 +0200 +@@ -1,8 +1,7 @@ +-CC = gcc +-CFLAGS = -O2 -Wall +-INCDIR = -I/usr/X11R6/include/X11 +-DESTDIR= /usr/X11R6 +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS ?= -O2 ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib + # for linux + LIBS = -lXpm -lX11 -lXext + # for Solaris +@@ -12,14 +11,14 @@ + + + .c.o: +- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) ++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -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) $(SYSTEM) -o wmSpaceWeather $(OBJS) $(LIBDIR) $(LIBS) + + clean: + for i in $(OBJS) ; do \ +@@ -28,7 +27,7 @@ + rm -f wmSpaceWeather + + install:: wmSpaceWeather +- install -s -m 0755 wmSpaceWeather $(DESTDIR)/bin +- install -m 0755 GetKp $(DESTDIR)/bin +- install -m 0644 wmSpaceWeather.1 $(DESTDIR)/man/man1 ++ ${BSD_INSTALL_PROGRAM} wmSpaceWeather $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_SCRIPT} GetKp $(DESTDIR)$(PREFIX)/bin ++ ${BSD_INSTALL_MAN} wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/man/man1 + Modified: head/astro/wmspaceweather/files/patch-wmSpaceWeather.c ============================================================================== --- head/astro/wmspaceweather/files/patch-wmSpaceWeather.c Fri Apr 4 19:56:17 2014 (r350160) +++ head/astro/wmspaceweather/files/patch-wmSpaceWeather.c Fri Apr 4 19:57:17 2014 (r350161) @@ -1,6 +1,6 @@ ---- wmSpaceWeather.c.orig Thu Feb 18 17:57:45 1999 -+++ wmSpaceWeather.c Tue Apr 13 20:06:41 2004 -@@ -115,7 +115,7 @@ XEvent event; +--- ./wmSpaceWeather.c.orig 1999-02-18 18:57:45.000000000 +0100 ++++ ./wmSpaceWeather.c 2014-04-04 21:55:15.061690087 +0200 +@@ -115,7 +115,7 @@ int i, n, s, k, m, dt1, dt2; int Year, Month, Day, DayOfMonth, OldDayOfMonth; int Hours, Mins, Secs, OldSecs, xoff, D[10], xsize; @@ -9,7 +9,7 @@ int height, UpToDate, LEDOn; double UT, TU, TU2, TU3, T0, gmst, hour24(); -@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, +@@ -126,6 +126,7 @@ double E1, E2, P1, P2, P3; char Xray[10], digit[2]; FILE *fp; @@ -17,7 +17,7 @@ -@@ -249,13 +250,13 @@ FILE *fp; +@@ -249,13 +250,13 @@ /* @@ -33,7 +33,7 @@ dt2 = 0; -@@ -272,13 +273,13 @@ FILE *fp; +@@ -272,13 +273,13 @@ Secs = Time->tm_sec; UT = (double)Hours + (double)Mins/60.0 + (double)Secs/3600.0; CurrentJD = jd(Year, Month, Day, UT); @@ -49,7 +49,7 @@ for (i=0; i<8; ++i){ fscanf(fp, "%ld %d", &TimeTag[i], &Kp[i]); -@@ -289,7 +290,7 @@ FILE *fp; +@@ -289,7 +290,7 @@ fscanf(fp, "%lf", &P3); fscanf(fp, "%lf", &E1); fscanf(fp, "%lf", &E2); @@ -58,7 +58,7 @@ fclose(fp); } else { -@@ -318,7 +319,7 @@ FILE *fp; +@@ -318,7 +319,7 @@ LatestAvailJD = jd(Year, Month, Day, UT); DeltaT = (CurrentJD - LatestAvailJD)*24.0; @@ -67,7 +67,7 @@ if (!UpToDate){ -@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[] +@@ -560,7 +561,7 @@ } else if ((!strcmp(argv[i], "-url"))||(!strcmp(argv[i], "-u"))){ @@ -76,7 +76,7 @@ } else { -@@ -651,7 +652,7 @@ void pressEvent(XButtonEvent *xev){ +@@ -651,7 +652,7 @@ if (GotDoubleClick1) { GotFirstClick1 = 0; GotDoubleClick1 = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404041957.s34JvHdl065153>