From nemysis@gmx.ch  Mon Dec  3 23:05:46 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9124F75E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Dec 2012 23:05:46 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22])
	by mx1.freebsd.org (Postfix) with SMTP id 0EAD78FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Dec 2012 23:05:45 +0000 (UTC)
Received: (qmail invoked by alias); 03 Dec 2012 23:05:37 -0000
Received: from 226-42.104-92.cust.bluewin.ch (EHLO something.email.com) [92.104.42.226]
  by mail.gmx.net (mp070) with SMTP; 04 Dec 2012 00:05:37 +0100
Received: by something.email.com (sSMTP sendmail emulation); Tue, 04 Dec 2012 00:05:37 +0100
Message-Id: <20121203230546.9124F75E@hub.freebsd.org>
Date: Tue, 04 Dec 2012 00:05:37 +0100
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] misc/wmweather+: update to 2.13, take maintainership, added license
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         174099
>Category:       ports
>Synopsis:       [PATCH] misc/wmweather+: update to 2.13, take maintainership, added license
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 03 23:10:00 UTC 2012
>Closed-Date:    Fri Mar 15 18:06:02 UTC 2013
>Last-Modified:  Fri Mar 15 18:10:01 UTC 2013
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
- Update to 2.13
- Take maintainership

Added file(s):
- files/pkg-message.in

Makefile changed:
+LICENSE=	GPLv2
+PORTDOCS=	ChangeLog README
+SUB_FILES=	pkg-message
+OPTIONS_DEFAULT=	EXAMPLES
+.if ${PORT_OPTIONS:MDOCS}

Changed and refined:
 post-patch:
 do-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 pkg-descr

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- wmweather+-2.13.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/misc/wmweather+/Makefile ./Makefile
--- /usr/ports/misc/wmweather+/Makefile	2012-11-16 09:03:16.000000000 +0100
+++ ./Makefile	2012-12-03 23:59:43.000000000 +0100
@@ -2,15 +2,16 @@
 # $FreeBSD: head/misc/wmweather+/Makefile 306302 2012-10-23 09:23:15Z bapt $
 
 PORTNAME=		wmweather+
-PORTVERSION=		2.11
-PORTREVISION=	6
+PORTVERSION=		2.13
 CATEGORIES=		misc windowmaker geography
 MASTER_SITES=		SF/wmweatherplus/wmweather%2B/
 DISTNAME=		wmweather%2B-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Displays current conditions and forecasts with icons and text
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		pcre:${PORTSDIR}/devel/pcre \
 		tiff:${PORTSDIR}/graphics/tiff \
@@ -19,6 +20,8 @@
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		gif.5:${PORTSDIR}/graphics/giflib
 
+WRKSRC=	${WRKDIR}/wmweather+-${PORTVERSION}
+
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
 USE_XORG=	xpm
@@ -29,8 +32,12 @@
 			--with-xpm-includes=${LOCALBASE} \
 			--with-xpm-libraries=${LOCALBASE}
 
+PORTDOCS=	ChangeLog README
+
+SUB_FILES=	pkg-message
+
 OPTIONS_DEFINE=	WM EXAMPLES
-OPTIONS_DEFAULT=	WM
+OPTIONS_DEFAULT=	EXAMPLES
 WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
 
 MAN1=		wmweather+.1
@@ -39,45 +46,37 @@
 
 .include <bsd.port.options.mk>
 
-CFLAGS:=	${CFLAGS:C/-O[0-9]/-O0/}
-
 .if ${PORT_OPTIONS:MWM}
 LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/windowmaker
 .else
 LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/libwraster
 .endif
 
-WRKSRC=	${WRKDIR}/wmweather+-${PORTVERSION}
-
 post-patch:
-	@${CP} ${WRKSRC}/wmweather+.c ${WRKSRC}/wmweather+.c.dist
-	@${SED} -e "s#^void usage(int i) __THROW.*#void usage(int i);#" \
-		${WRKSRC}/wmweather+.c.dist > ${WRKSRC}/wmweather+.c
+	@${REINPLACE_CMD} -e 's|void usage(int i) __THROW __attribute__ ((__noreturn__));|void usage(int i);|' \
+		${WRKSRC}/wmweather+.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmweather+ ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmweather+.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}/HINTS
-	${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}/example.conf
+	${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}
 PLIST_FILES+=	${EXAMPLESDIR_REL}/HINTS
 PLIST_FILES+=	${EXAMPLESDIR_REL}/example.conf
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
-PM=		${WRKDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${ECHO} "===================================================" > ${PM}
-	@${ECHO} "A sample configuration file has been copied to" >> ${PM}
-	@${ECHO} "${EXAMPLESDIR}/example.conf" >> ${PM}
-	@${ECHO} "" >> ${PM}
-	@${ECHO} "Please copy it to ~/.wmweather+/conf and adjust it" >> ${PM}
-	@${ECHO} "to your needs!" >> ${PM}
-	@${ECHO} "===================================================" >> ${PM}
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
-.endif
+	@${ECHO_CMD}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/misc/wmweather+/distinfo ./distinfo
--- /usr/ports/misc/wmweather+/distinfo	2012-11-16 09:03:16.000000000 +0100
+++ ./distinfo	2012-12-03 17:54:04.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (wmweather%2B-2.11.tar.gz) = bab0d2d2cac65db51bb25f70b028ee7c55642119d2b38441aff65553a35566f9
-SIZE (wmweather%2B-2.11.tar.gz) = 193596
+SHA256 (wmweather%2B-2.13.tar.gz) = d15d8f491022e2f092d91a3a463b3200a4ac620ac93b0ecff796751d28e997d2
+SIZE (wmweather%2B-2.13.tar.gz) = 195094
diff -ruN --exclude=CVS /usr/ports/misc/wmweather+/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/misc/wmweather+/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in	2012-12-03 20:54:33.000000000 +0100
@@ -0,0 +1,12 @@
+===============================================================================
+
+wmweather+ has been installed.
+
+All options are given in the config file and in command line (CLI)
+
+Please copy example.conf to yours home directory and adjust it to your needs!
+
+    mkdir ~/.wmweather+
+    cp -a %%EXAMPLESDIR%%/example.conf ~/.wmweather+/conf
+
+===============================================================================
diff -ruN --exclude=CVS /usr/ports/misc/wmweather+/pkg-descr ./pkg-descr
--- /usr/ports/misc/wmweather+/pkg-descr	2012-11-16 09:03:16.000000000 +0100
+++ ./pkg-descr	2012-12-03 18:33:33.000000000 +0100
@@ -1,7 +1,7 @@
-wmweather+ will download the National Weather Serivce METAR bulletins, 
-ANV and MRF forecasts, and any weather map for display in a WindowMaker
-dockapp. Think wmweather with a smaller font, forecasts, a weather map,
-and a sky condition display.
+wmweather+ will download the National Weather Serivce METAR bulletins;
+AVN, ETA, and MRF forecasts; and any weather map for display in a
+WindowMaker dockapp. Think wmweather with a smaller font, forecasts,
+a weather map, and a sky condition display.
 
 You will need to look up the METAR code for your city (a standard code
 used in aviation).
--- wmweather+-2.13.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Thu Mar 14 21:20:08 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174099 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Fri Mar 15 18:06:01 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174099 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174099: commit references a PR
Date: Fri, 15 Mar 2013 18:05:41 +0000 (UTC)

 Author: pawel
 Date: Fri Mar 15 18:05:28 2013
 New Revision: 314321
 URL: http://svnweb.freebsd.org/changeset/ports/314321
 
 Log:
   - Update to version 2.13
   - Add license info
   - Use pkg-message file to display configure tips
   - Support DOCS option
   - Give maintainership to submitter
   
   PR:		ports/174099
   Submitted by:	nemysis <nemysis@gmx.ch>
 
 Added:
   head/misc/wmweather+/files/
   head/misc/wmweather+/files/pkg-message.in   (contents, props changed)
 Modified:
   head/misc/wmweather+/Makefile   (contents, props changed)
   head/misc/wmweather+/distinfo   (contents, props changed)
   head/misc/wmweather+/pkg-descr   (contents, props changed)
 
 Modified: head/misc/wmweather+/Makefile
 ==============================================================================
 --- head/misc/wmweather+/Makefile	Fri Mar 15 17:52:36 2013	(r314320)
 +++ head/misc/wmweather+/Makefile	Fri Mar 15 18:05:28 2013	(r314321)
 @@ -2,22 +2,25 @@
  # $FreeBSD$
  
  PORTNAME=		wmweather+
 -PORTVERSION=		2.11
 -PORTREVISION=	7
 +PORTVERSION=		2.13
  CATEGORIES=		misc windowmaker geography
  MASTER_SITES=		SF/wmweatherplus/wmweather%2B/
  DISTNAME=		wmweather%2B-${PORTVERSION}
  
 -MAINTAINER=	ports@FreeBSD.org
 +MAINTAINER=	nemysis@gmx.ch
  COMMENT=	Displays current conditions and forecasts with icons and text
  
 +LICENSE=	GPLv2
 +
  LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
  		pcre:${PORTSDIR}/devel/pcre \
  		tiff:${PORTSDIR}/graphics/tiff \
  		Hermes:${PORTSDIR}/graphics/Hermes \
  		png15:${PORTSDIR}/graphics/png \
  		jpeg:${PORTSDIR}/graphics/jpeg \
 -		gif.5:${PORTSDIR}/graphics/giflib
 +		gif:${PORTSDIR}/graphics/giflib
 +
 +WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
  
  GNU_CONFIGURE=	yes
  USE_ICONV=	yes
 @@ -29,8 +32,12 @@ CONFIGURE_ARGS+=	--with-libwraster=${LOC
  			--with-xpm-includes=${LOCALBASE} \
  			--with-xpm-libraries=${LOCALBASE}
  
 -OPTIONS_DEFINE=	WM EXAMPLES
 -OPTIONS_DEFAULT=	WM
 +PORTEXAMPLES=	HINTS example.conf
 +PORTDOCS=	ChangeLog README
 +
 +SUB_FILES=	pkg-message
 +
 +OPTIONS_DEFINE=	DOCS EXAMPLES WM
  WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
  
  MAN1=		wmweather+.1
 @@ -39,45 +46,34 @@ PLIST_FILES=	bin/wmweather+
  
  .include <bsd.port.options.mk>
  
 -CFLAGS:=	${CFLAGS:C/-O[0-9]/-O0/}
 -
  .if ${PORT_OPTIONS:MWM}
  LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/windowmaker
  .else
  LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/libwraster
  .endif
  
 -WRKSRC=	${WRKDIR}/wmweather+-${PORTVERSION}
 -
  post-patch:
 -	@${CP} ${WRKSRC}/wmweather+.c ${WRKSRC}/wmweather+.c.dist
 -	@${SED} -e "s#^void usage(int i) __THROW.*#void usage(int i);#" \
 -		${WRKSRC}/wmweather+.c.dist > ${WRKSRC}/wmweather+.c
 +	@${REINPLACE_CMD} -e 's|void usage(int i) __THROW __attribute__ ((__noreturn__));|void usage(int i);|' \
 +		${WRKSRC}/wmweather+.c
  
  do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/wmweather+ ${PREFIX}/bin
 -	${INSTALL_MAN} ${WRKSRC}/wmweather+.1 ${PREFIX}/man/man1
 +	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 +	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
 +
 +.if ${PORT_OPTIONS:MDOCS}
 +	${MKDIR} ${DOCSDIR}
 +	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 +.endif
 +
  .if ${PORT_OPTIONS:MEXAMPLES}
  	${MKDIR} ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}/HINTS
 -	${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}/example.conf
 -PLIST_FILES+=	${EXAMPLESDIR_REL}/HINTS
 -PLIST_FILES+=	${EXAMPLESDIR_REL}/example.conf
 -PLIST_DIRS+=	${EXAMPLESDIR_REL}
 -PM=		${WRKDIR}/pkg-message
 -PKGMESSAGE=	${WRKDIR}/pkg-message
 +	${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}
 +	${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}
  .endif
  
  post-install:
 -.if ${PORT_OPTIONS:MEXAMPLES}
 -	@${ECHO} "===================================================" > ${PM}
 -	@${ECHO} "A sample configuration file has been copied to" >> ${PM}
 -	@${ECHO} "${EXAMPLESDIR}/example.conf" >> ${PM}
 -	@${ECHO} "" >> ${PM}
 -	@${ECHO} "Please copy it to ~/.wmweather+/conf and adjust it" >> ${PM}
 -	@${ECHO} "to your needs!" >> ${PM}
 -	@${ECHO} "===================================================" >> ${PM}
 +	@${ECHO_CMD}
  	@${CAT} ${PKGMESSAGE}
 -.endif
 +	@${ECHO_CMD}
  
  .include <bsd.port.mk>
 
 Modified: head/misc/wmweather+/distinfo
 ==============================================================================
 --- head/misc/wmweather+/distinfo	Fri Mar 15 17:52:36 2013	(r314320)
 +++ head/misc/wmweather+/distinfo	Fri Mar 15 18:05:28 2013	(r314321)
 @@ -1,2 +1,2 @@
 -SHA256 (wmweather%2B-2.11.tar.gz) = bab0d2d2cac65db51bb25f70b028ee7c55642119d2b38441aff65553a35566f9
 -SIZE (wmweather%2B-2.11.tar.gz) = 193596
 +SHA256 (wmweather%2B-2.13.tar.gz) = d15d8f491022e2f092d91a3a463b3200a4ac620ac93b0ecff796751d28e997d2
 +SIZE (wmweather%2B-2.13.tar.gz) = 195094
 
 Added: head/misc/wmweather+/files/pkg-message.in
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/misc/wmweather+/files/pkg-message.in	Fri Mar 15 18:05:28 2013	(r314321)
 @@ -0,0 +1,12 @@
 +===============================================================================
 +
 +wmweather+ has been installed.
 +
 +All options are given in the config file and in command line (CLI)
 +
 +Please copy example.conf to yours home directory and adjust it to your needs!
 +
 +    mkdir ~/.wmweather+
 +    cp -a %%EXAMPLESDIR%%/example.conf ~/.wmweather+/conf
 +
 +===============================================================================
 
 Modified: head/misc/wmweather+/pkg-descr
 ==============================================================================
 --- head/misc/wmweather+/pkg-descr	Fri Mar 15 17:52:36 2013	(r314320)
 +++ head/misc/wmweather+/pkg-descr	Fri Mar 15 18:05:28 2013	(r314321)
 @@ -1,7 +1,7 @@
 -wmweather+ will download the National Weather Serivce METAR bulletins, 
 -ANV and MRF forecasts, and any weather map for display in a WindowMaker
 -dockapp. Think wmweather with a smaller font, forecasts, a weather map,
 -and a sky condition display.
 +wmweather+ will download the National Weather Serivce METAR bulletins;
 +AVN, ETA, and MRF forecasts; and any weather map for display in a
 +WindowMaker dockapp. Think wmweather with a smaller font, forecasts,
 +a weather map, and a sky condition display.
  
  You will need to look up the METAR code for your city (a standard code
  used in aviation).
 _______________________________________________
 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"
 
>Unformatted:
