[Midnightbsd-cvs] mports [19400] trunk/misc/wmweather+: wmweather+ 2.15

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 9 08:54:53 EDT 2015 

Revision: 19400
          http://svnweb.midnightbsd.org/mports/?rev=19400
Author:   laffer1
Date:     2015-06-09 08:54:53 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
wmweather+ 2.15

Modified Paths:
--------------
    trunk/misc/wmweather+/Makefile
    trunk/misc/wmweather+/distinfo
    trunk/misc/wmweather+/pkg-descr

Removed Paths:
-------------
    trunk/misc/wmweather+/pkg-message
    trunk/misc/wmweather+/pkg-plist

Modified: trunk/misc/wmweather+/Makefile
===================================================================
--- trunk/misc/wmweather+/Makefile	2015-06-09 12:53:02 UTC (rev 19399)
+++ trunk/misc/wmweather+/Makefile	2015-06-09 12:54:53 UTC (rev 19400)
@@ -1,42 +1,81 @@
 # $MidnightBSD$
 
 PORTNAME=	wmweather+
-PORTVERSION=	2.11
-PORTREVISION=	5
+PORTVERSION=	2.15
 CATEGORIES=	misc windowmaker geography
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=wmweatherplus
+MASTER_SITES=	SF/wmweatherplus/wmweather%2B/ \
+		SF/nemysisfreebsdp/misc/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Displays current conditions and forecasts with icons and text
+
 LICENSE=	gpl2
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		wraster:${PORTSDIR}/x11-wm/windowmaker \
-		pcre:${PORTSDIR}/devel/pcre \
-		tiff:${PORTSDIR}/graphics/tiff \
-		Hermes:${PORTSDIR}/graphics/Hermes \
-		png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		ungif:${PORTSDIR}/graphics/libungif
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libHermes.so:${PORTSDIR}/graphics/Hermes \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libgif.so:${PORTSDIR}/graphics/giflib
 
+WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
+
+USES=		iconv
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-USE_XORG=	xpm
+LDFLAGS+=	-lm
+CONFIGURE_ARGS+=	--with-libwraster=${LOCALBASE} \
+			--with-libpcre=${LOCALBASE} \
+			--with-libcurl=${LOCALBASE} \
+			--with-xpm-includes=${LOCALBASE} \
+			--with-xpm-libraries=${LOCALBASE}
 
-CONFIGURE_ARGS+=	--with-libwraster=${LOCALBASE}
-MAN1=		wmweather+.1
+SUB_FILES=	pkg-message
 
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz \
+		share/pixmaps/${PORTNAME}.png
+
+PORTDOCS=	ChangeLog README
+PORTEXAMPLES=	HINTS example.conf
+
+OPTIONS_DEFINE=	DOCS EXAMPLES WM
+WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
+
+DESKTOP_ENTRIES="${PORTNAME}" "" "${PORTNAME}" \
+		"${PORTNAME}" "System;Monitor;" ""
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MWM}
+LIB_DEPENDS+=	libWMaker.so:${PORTSDIR}/x11-wm/windowmaker
+.else
+LIB_DEPENDS+=	libwraster.so:${PORTSDIR}/x11-wm/libwraster
+.endif
+
 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| __THROW __attribute__ ((__noreturn__))|| ; \
+		s|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
+		${WRKSRC}/${PORTNAME}.c
+	@${REINPLACE_CMD} -e \
+		's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
+		${WRKSRC}/${PORTNAME}.1.in
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmweather+ ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/wmweather+.1 ${PREFIX}/man/man1
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}/HINTS
-	@${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}/example.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>

Modified: trunk/misc/wmweather+/distinfo
===================================================================
--- trunk/misc/wmweather+/distinfo	2015-06-09 12:53:02 UTC (rev 19399)
+++ trunk/misc/wmweather+/distinfo	2015-06-09 12:54:53 UTC (rev 19400)
@@ -1,3 +1,4 @@
-SHA256 (wmweather+-2.11.tar.gz) = bab0d2d2cac65db51bb25f70b028ee7c55642119d2b38441aff65553a35566f9
-RMD160 (wmweather+-2.11.tar.gz) = d8b2e383b6e10cd10feb695d41d01ca580540458
-SIZE (wmweather+-2.11.tar.gz) = 193596
+SHA256 (wmweather+-2.15.tar.gz) = 3e7931527a1b5e8def17abc2987ec43508a2cc3394c2f340b6e0062e5bfadbd1
+SIZE (wmweather+-2.15.tar.gz) = 209258
+SHA256 (wmweather+.png) = 4330af568e7b460882c6afeee9aadd2b71ec01cbbdc649819b96d049be48288b
+SIZE (wmweather+.png) = 5730

Modified: trunk/misc/wmweather+/pkg-descr
===================================================================
--- trunk/misc/wmweather+/pkg-descr	2015-06-09 12:53:02 UTC (rev 19399)
+++ trunk/misc/wmweather+/pkg-descr	2015-06-09 12:54:53 UTC (rev 19400)
@@ -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).

Deleted: trunk/misc/wmweather+/pkg-message
===================================================================
--- trunk/misc/wmweather+/pkg-message	2015-06-09 12:53:02 UTC (rev 19399)
+++ trunk/misc/wmweather+/pkg-message	2015-06-09 12:54:53 UTC (rev 19400)
@@ -1,5 +0,0 @@
-A sample configuration file has been copied to
-/usr/local/share/examples/wmweather+/example.conf
-
-Please copy it to ~/.wmweather+/conf and adjust it
-to your needs!

Deleted: trunk/misc/wmweather+/pkg-plist
===================================================================
--- trunk/misc/wmweather+/pkg-plist	2015-06-09 12:53:02 UTC (rev 19399)
+++ trunk/misc/wmweather+/pkg-plist	2015-06-09 12:54:53 UTC (rev 19400)
@@ -1,5 +0,0 @@
- at comment $MidnightBSD$
-bin/wmweather+
-%%EXAMPLESDIR%%/HINTS
-%%EXAMPLESDIR%%/example.conf
- at dirrm %%EXAMPLESDIR%%

More information about the Midnightbsd-cvs mailing list