svn commit: r383467 - in head/astro/wmsun: . files

[Baptiste Daroussin]

Author: bapt
Date: Mon Apr  6 18:50:50 2015
New Revision: 383467
URL: https://svnweb.freebsd.org/changeset/ports/383467

Log:
  astro/wmsun: Update to version 1.12
  Fix MASTER_SITES

Modified:
  head/astro/wmsun/Makefile
  head/astro/wmsun/distinfo
  head/astro/wmsun/files/patch-Makefile
  head/astro/wmsun/files/patch-wmSun.c
  head/astro/wmsun/pkg-descr

Modified: head/astro/wmsun/Makefile
==============================================================================
--- head/astro/wmsun/Makefile	Mon Apr  6 18:49:52 2015	(r383466)
+++ head/astro/wmsun/Makefile	Mon Apr  6 18:50:50 2015	(r383467)
@@ -2,21 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	wmsun
-PORTVERSION=	1.03
-PORTREVISION=	2
+PORTVERSION=	1.12
 CATEGORIES=	astro windowmaker
-MASTER_SITES=	http://dockapps.windowmaker.org/download.php/id/23/
-DISTNAME=	wmSun-1.03
+MASTER_SITES=	http://linux-bsd-unix.strefa.pl/
+DISTNAME=	wmSun-${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Dockapp that displays the rise and set times of the Sun
 
-BROKEN=		No public distfiles
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/wmSun
+WRKSRC_SUBDIR=	wmSun
 
 USE_XORG=	xext xpm x11
-ALL_TARGET=	clean all
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
 		INCDIR="-I${LOCALBASE}/include" LIBDIR="-L${LOCALBASE}/lib"
 MAKE_JOBS_UNSAFE=	yes

Modified: head/astro/wmsun/distinfo
==============================================================================
--- head/astro/wmsun/distinfo	Mon Apr  6 18:49:52 2015	(r383466)
+++ head/astro/wmsun/distinfo	Mon Apr  6 18:50:50 2015	(r383467)
@@ -1,2 +1,2 @@
-SHA256 (wmSun-1.03.tar.gz) = 53d81d1ac9541c153917c4d0bb9813308268a1d1b47ed0e5b685e4a17b36b193
-SIZE (wmSun-1.03.tar.gz) = 184320
+SHA256 (wmSun-1.12.tar.gz) = d05fb019dd835fc33b2c7c3fb7cf1b6a8cd7fe59b62c8d3fa00ddd0f776da15d
+SIZE (wmSun-1.12.tar.gz) = 147170

Modified: head/astro/wmsun/files/patch-Makefile
==============================================================================
--- head/astro/wmsun/files/patch-Makefile	Mon Apr  6 18:49:52 2015	(r383466)
+++ head/astro/wmsun/files/patch-Makefile	Mon Apr  6 18:50:50 2015	(r383467)
@@ -1,19 +1,17 @@
 --- Makefile.orig	Wed Jan  6 11:28:39 1999
 +++ Makefile	Thu Aug  3 21:28:34 2000
-@@ -22,14 +22,14 @@
- 
+@@ -18,12 +18,12 @@
+ OBJS   = wmSun.o SunRise.o ../wmgeneral/wmgeneral.o
  
  .c.o:
 -	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
 +	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
  
- 
  all:	wmSun.o wmSun
  
- wmSun.o: wmSun_master.xpm wmSun_mask.xbm 
- wmSun:	$(OBJS) 
--	$(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+	$(CC) $(CFLAGS) $(SYSTEM) -lm -o wmSun $(OBJS) $(LIBDIR) $(LIBS)
+ wmSun:	$(OBJS)
+-	$(CC) $(COPTS) $(SYSTEM) -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(SYSTEM) -o wmSun $(OBJS) $(LIBDIR) $(LIBS)
  
  clean:
- 	for i in $(OBJS) ; do \
+ 	for i in $(OBJS) ; do rm -f $$i; done

Modified: head/astro/wmsun/files/patch-wmSun.c
==============================================================================
--- head/astro/wmsun/files/patch-wmSun.c	Mon Apr  6 18:49:52 2015	(r383466)
+++ head/astro/wmsun/files/patch-wmSun.c	Mon Apr  6 18:50:50 2015	(r383467)
@@ -3,10 +3,10 @@ $FreeBSD$
 
 --- wmSun.c.orig	Thu Aug 15 18:04:04 2002
 +++ wmSun.c	Thu Aug 15 18:06:24 2002
-@@ -129,7 +129,8 @@
-     int 		Year, Month, DayOfWeek, OldLocalDayOfMonth;
-     int			LocalDayOfMonth,	DayOfMonth;
+@@ -76,7 +76,8 @@
+     int			LocalDayOfMonth, DayOfMonth;
      int			Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
+     int			OldMins;
 -    long		CurrentLocalTime, CurrentGMTTime, date;
 +    time_t		CurrentLocalTime, CurrentGMTTime;
 +    long		date;

Modified: head/astro/wmsun/pkg-descr
==============================================================================
--- head/astro/wmsun/pkg-descr	Mon Apr  6 18:49:52 2015	(r383466)
+++ head/astro/wmsun/pkg-descr	Mon Apr  6 18:50:50 2015	(r383467)
@@ -1,3 +1,3 @@
 A dockapp that displays the rise and set time of the sun.
 
-WWW: http://dockapps.windowmaker.org/file.php/id/16/
+WWW: http://linux-bsd-unix.strefa.pl/