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 ---