From owner-svn-ports-all@FreeBSD.ORG Fri Jan 17 04:17:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3FD7C64; Fri, 17 Jan 2014 04:17:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7B67B1A47; Fri, 17 Jan 2014 04:17:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0H4HhFa070218; Fri, 17 Jan 2014 04:17:43 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0H4Hg3p070215; Fri, 17 Jan 2014 04:17:42 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401170417.s0H4Hg3p070215@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 17 Jan 2014 04:17:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340013 - in head/misc/wmweather+: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 04:17:43 -0000 Author: nemysis Date: Fri Jan 17 04:17:42 2014 New Revision: 340013 URL: http://svnweb.freebsd.org/changeset/ports/340013 QAT: https://qat.redports.org/buildarchive/r340013/ Log: - Update to 2.15 - Change master sites, add icon - Use the new format for LIB_DEPENDS - Add Desktop entry file - Support STAGEDIR - Change REINPLACE_CMD, ajdust NOAA site - Change pkg-message Modified: head/misc/wmweather+/Makefile head/misc/wmweather+/distinfo head/misc/wmweather+/files/pkg-message.in Modified: head/misc/wmweather+/Makefile ============================================================================== --- head/misc/wmweather+/Makefile Fri Jan 17 03:53:35 2014 (r340012) +++ head/misc/wmweather+/Makefile Fri Jan 17 04:17:42 2014 (r340013) @@ -1,51 +1,54 @@ # Created by: Harald Wille # $FreeBSD$ -PORTNAME= wmweather+ -PORTVERSION= 2.13 -PORTREVISION= 1 -CATEGORIES= misc windowmaker geography -MASTER_SITES= SF/wmweatherplus/wmweather%2B/ -DISTNAME= wmweather%2B-${PORTVERSION} +PORTNAME= wmweather+ +PORTVERSION= 2.15 +CATEGORIES= misc windowmaker geography +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= nemysis@FreeBSD.org 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:${PORTSDIR}/graphics/giflib +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libpcre.so:${PORTSDIR}/devel/pcre \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libHermes.so:${PORTSDIR}/graphics/Hermes \ + libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libgif.so:${PORTSDIR}/graphics/giflib WRKSRC= ${WRKDIR}/wmweather+-${PORTVERSION} -GNU_CONFIGURE= yes USES= iconv USE_XORG= xpm - +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libwraster=${LOCALBASE} \ --with-libpcre=${LOCALBASE} \ --with-libcurl=${LOCALBASE} \ --with-xpm-includes=${LOCALBASE} \ --with-xpm-libraries=${LOCALBASE} -PORTEXAMPLES= HINTS example.conf -PORTDOCS= ChangeLog README - 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) -MAN1= wmweather+.1 - -PLIST_FILES= bin/wmweather+ +DESKTOP_ENTRIES="${PORTNAME}" "" "${PORTNAME}" \ + "${PORTNAME}" "System;Monitor;" "" -NO_STAGE= yes .include .if ${PORT_OPTIONS:MWM} @@ -55,27 +58,24 @@ LIB_DEPENDS+= wraster:${PORTSDIR}/x11-wm .endif post-patch: - @${REINPLACE_CMD} -e 's|void usage(int i) __THROW __attribute__ ((__noreturn__));|void usage(int i);|' \ - ${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}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 + ${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/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/misc/wmweather+/distinfo ============================================================================== --- head/misc/wmweather+/distinfo Fri Jan 17 03:53:35 2014 (r340012) +++ head/misc/wmweather+/distinfo Fri Jan 17 04:17:42 2014 (r340013) @@ -1,2 +1,4 @@ -SHA256 (wmweather%2B-2.13.tar.gz) = d15d8f491022e2f092d91a3a463b3200a4ac620ac93b0ecff796751d28e997d2 -SIZE (wmweather%2B-2.13.tar.gz) = 195094 +SHA256 (wmweather+-2.15.tar.gz) = 3e7931527a1b5e8def17abc2987ec43508a2cc3394c2f340b6e0062e5bfadbd1 +SIZE (wmweather+-2.15.tar.gz) = 209258 +SHA256 (wmweather+.png) = 4330af568e7b460882c6afeee9aadd2b71ec01cbbdc649819b96d049be48288b +SIZE (wmweather+.png) = 5730 Modified: head/misc/wmweather+/files/pkg-message.in ============================================================================== --- head/misc/wmweather+/files/pkg-message.in Fri Jan 17 03:53:35 2014 (r340012) +++ head/misc/wmweather+/files/pkg-message.in Fri Jan 17 04:17:42 2014 (r340013) @@ -6,7 +6,14 @@ All options are given in the config file Please copy example.conf to yours home directory and adjust it to your needs! + su user + mkdir ~/.wmweather+ + cp -a %%EXAMPLESDIR%%/example.conf ~/.wmweather+/conf + exit + +Have fun! + ===============================================================================