Bug 181066

Summary: misc/gkrellweather2: Update to version 2.0.8
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: Pawel Pekala <pawel>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
misc_gkrellweather2.diff
none
misc_gkrellweather2.diff none

Description tkato432 2013-08-05 19:10:04 UTC 
- Update to version 2.0.8

Remove file:
files/extra-patch-lrintf
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-08-05 19:11:18 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 tkato432 2013-09-11 18:57:45 UTC 
Remake of the patch against current tree.
Comment 3 Bryan Drewery freebsd_committer freebsd_triage 2013-09-22 15:10:53 UTC 
Responsible Changed
From-To: miwi->freebsd-ports-bugs

Back to the heap due to timeout
Comment 4 tkato432 2013-10-31 19:26:00 UTC 
Remake of the patch against current tree.
Comment 5 Pawel Pekala freebsd_committer freebsd_triage 2013-11-02 09:03:18 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-11-02 12:59:01 UTC 
Author: pawel
Date: Sat Nov  2 12:58:52 2013
New Revision: 332478
URL: http://svnweb.freebsd.org/changeset/ports/332478

Log:
  - Update to version 2.0.8
  - Add LICENSE
  - Support staging
  - Update homepage
  
  PR:		ports/181066
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  head/misc/gkrellweather2/files/extra-patch-lrintf
Modified:
  head/misc/gkrellweather2/Makefile   (contents, props changed)
  head/misc/gkrellweather2/distinfo   (contents, props changed)
  head/misc/gkrellweather2/files/patch-Makefile   (contents, props changed)
  head/misc/gkrellweather2/files/patch-gkrellweather.c   (contents, props changed)
  head/misc/gkrellweather2/pkg-descr   (contents, props changed)

Modified: head/misc/gkrellweather2/Makefile
==============================================================================
--- head/misc/gkrellweather2/Makefile	Sat Nov  2 12:58:37 2013	(r332477)
+++ head/misc/gkrellweather2/Makefile	Sat Nov  2 12:58:52 2013	(r332478)
@@ -2,36 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	gkrellweather
-PORTVERSION=	2.0.7
-PORTREVISION=	9
+PORTVERSION=	2.0.8
 CATEGORIES=	misc geography
-MASTER_SITES=	http://makovick.googlepages.com/
+MASTER_SITES=	https://sites.google.com/site/makovick/projects/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GKrellWeather is a weather plugin for GKrellM
+COMMENT=	Weather plugin for GKrellM
+
+LICENSE=	GPLv2 # (or later)
 
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
-USES=		gmake pkgconfig
-ALL_TARGET=	gkrellweather.so
-
-MAKE_ENV=	enable_nls=1 PTHREAD_LIBS=${PTHREAD_LIBS}
+FETCH_ARGS=	-Fpr
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-# uses C99 builtin lrintf
-.if ${ARCH} != "amd64"
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-lrintf
-.endif
+USES=		gettext gmake pkgconfig
+MAKE_ENV=	enable_nls=1
+ALL_TARGET=	gkrellweather.so
 
 do-install:
-	${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins
-	${INSTALL_DATA} ${WRKSRC}/gkrellweather.so ${PREFIX}/libexec/gkrellm2/plugins
-	${MKDIR} ${PREFIX}/share/locale/ru/
-	${INSTALL_DATA} ${WRKSRC}/po/ru.mo ${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellweather.mo
-	${INSTALL_SCRIPT} ${WRKSRC}/GrabWeather ${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} GrabWeather \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins
+	(cd ${WRKSRC} && ${INSTALL_DATA} gkrellweather.so \
+		${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/ru
+	(cd ${WRKSRC}/po && ${INSTALL_DATA} ru.mo \
+		${STAGEDIR}${PREFIX}/share/locale/ru/LC_MESSAGES/gkrellweather.mo)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/misc/gkrellweather2/distinfo
==============================================================================
--- head/misc/gkrellweather2/distinfo	Sat Nov  2 12:58:37 2013	(r332477)
+++ head/misc/gkrellweather2/distinfo	Sat Nov  2 12:58:52 2013	(r332478)
@@ -1,2 +1,2 @@
-SHA256 (gkrellweather-2.0.7.tgz) = ad902acd0ffb8adb1f0d838e57545d1f52a31ae33711b73d28929c2786a740ca
-SIZE (gkrellweather-2.0.7.tgz) = 19968
+SHA256 (gkrellweather-2.0.8.tgz) = 06236ad489151019e71bab4ba63b4b8b06d58c58890caed8b1a28fdd05cde16d
+SIZE (gkrellweather-2.0.8.tgz) = 20227

Modified: head/misc/gkrellweather2/files/patch-Makefile
==============================================================================
--- head/misc/gkrellweather2/files/patch-Makefile	Sat Nov  2 12:58:37 2013	(r332477)
+++ head/misc/gkrellweather2/files/patch-Makefile	Sat Nov  2 12:58:52 2013	(r332478)
@@ -24,7 +24,7 @@
  gkrellweather.so: $(OBJS)
  	(cd po && ${MAKE} all )
 -	$(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -lpthread
-+	$(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) ${PTHREAD_LIBS}
++	$(CC) $(OBJS) -DVERSION=\"$(VERSION)\" -o gkrellweather.so $(LFLAGS) $(LIBS) -pthread
  
  clean:
  	(cd po && ${MAKE} clean )

Modified: head/misc/gkrellweather2/files/patch-gkrellweather.c
==============================================================================
--- head/misc/gkrellweather2/files/patch-gkrellweather.c	Sat Nov  2 12:58:37 2013	(r332477)
+++ head/misc/gkrellweather2/files/patch-gkrellweather.c	Sat Nov  2 12:58:52 2013	(r332478)
@@ -1,19 +1,19 @@
 --- gkrellweather.c.orig	Mon Mar 31 13:12:57 2003
 +++ gkrellweather.c	Sun Jul 13 14:30:14 2003
-@@ -983,7 +983,7 @@
+@@ -986,7 +986,7 @@
      options.windspeed_unit = 1;
      options.pressure_unit = 1;
      strcpy(options.station, DEFAULT_STATION_ID);
--    sprintf(options.command, "/usr/share/gkrellm/GrabWeather %s", options.station);
-+    sprintf(options.command, "GrabWeather %s", options.station);
-     sprintf(options.filename, "%s/.wmWeatherReports/%s.dat",
-             getenv("HOME"), options.station);
- }
-@@ -993,6 +993,7 @@
+-    snprintf(options.command, 512, "/usr/share/gkrellm/GrabWeather %s", options.station);
++    snprintf(options.command, 512, "GrabWeather %s", options.station);
+     options.command[511] = 0;
+     snprintf(options.filename, 512, "%s/.wmWeatherReports/%s.dat",
+              getenv("HOME"), options.station);
+@@ -998,6 +998,7 @@
  gkrellm_init_plugin(void)
  {
      #ifdef ENABLE_NLS
-+    	bindtextdomain(PACKAGE, LOCALEDIR);
++        bindtextdomain(PACKAGE, LOCALEDIR);
          bind_textdomain_codeset(PACKAGE, "UTF-8");
      #endif /* ENABLE_NLS */
      style_id = gkrellm_add_meter_style(&air_mon, STYLE_NAME);

Modified: head/misc/gkrellweather2/pkg-descr
==============================================================================
--- head/misc/gkrellweather2/pkg-descr	Sat Nov  2 12:58:37 2013	(r332477)
+++ head/misc/gkrellweather2/pkg-descr	Sat Nov  2 12:58:52 2013	(r332478)
@@ -11,6 +11,6 @@ Features
 - Display using metric units (degrees Celsius, millimeters of
   Mercury, kilometers per hour)
 - Display pressure in kPa, hPa and mmHg
-- Display wind speeds in kmph, mps and beaufort scale
+- Display wind speeds in kmph, mps and Beaufort scale
 
-WWW: http://makovick.googlepages.com/gkrellmplugins
+WWW: https://sites.google.com/site/makovick/gkrellm-plugins
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Pawel Pekala freebsd_committer freebsd_triage 2013-11-02 12:59:20 UTC 
State Changed
From-To: open->closed

Committed. Thanks!