From owner-svn-ports-all@FreeBSD.ORG Wed Oct 16 05:48:30 2013 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 ESMTP id 44442C62; Wed, 16 Oct 2013 05:48:30 +0000 (UTC) (envelope-from cs@FreeBSD.org) 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 22215222A; Wed, 16 Oct 2013 05:48:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G5mUv7088761; Wed, 16 Oct 2013 05:48:30 GMT (envelope-from cs@svn.freebsd.org) Received: (from cs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G5mTW8088758; Wed, 16 Oct 2013 05:48:29 GMT (envelope-from cs@svn.freebsd.org) Message-Id: <201310160548.r9G5mTW8088758@svn.freebsd.org> From: Carlo Strub Date: Wed, 16 Oct 2013 05:48:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330480 - head/astro/xtide 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.14 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: Wed, 16 Oct 2013 05:48:30 -0000 Author: cs Date: Wed Oct 16 05:48:29 2013 New Revision: 330480 URL: http://svnweb.freebsd.org/changeset/ports/330480 Log: - Update to 2.13.2 - Support staging Modified: head/astro/xtide/Makefile head/astro/xtide/distinfo head/astro/xtide/pkg-plist Modified: head/astro/xtide/Makefile ============================================================================== --- head/astro/xtide/Makefile Wed Oct 16 05:05:52 2013 (r330479) +++ head/astro/xtide/Makefile Wed Oct 16 05:48:29 2013 (r330480) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= xtide -PORTVERSION= 2.13.1 +PORTVERSION= 2.13.2 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.flaterco.com/xtide/ \ http://www.c-s.li/ports/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${TCD_DISTNAME}${EXTRACT_SUFX} \ + ${TCD_DISTNAME}-r3${EXTRACT_SUFX} \ ${HARM_DISTNAME}-free${EXTRACT_SUFX} MAINTAINER= cs@FreeBSD.org @@ -17,16 +17,12 @@ LICENSE= GPLv3 LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -NO_STAGE= yes USE_BZIP2= yes USES= gmake USE_GCC= yes GNU_CONFIGURE= yes -MAN1= tide.1 -MAN8= xttpd.8 - -CPPFLAGS+= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng15 +CPPFLAGS+= -I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng15 -Wno-deprecated-declarations LDFLAGS+= -L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib TCD_DISTNAME= libtcd-2.2.5 @@ -51,7 +47,6 @@ ALL_TARGET+= tide xttpd PLIST_SUB+= X11="@comment " .else USE_XORG+= xpm xaw -MAN1+= xtide.1 PLIST_SUB+= X11="" .endif @@ -78,32 +73,27 @@ post-configure: < ${FILESDIR}/xtide.conf.example > ${WRKDIR}/xtide.conf.example do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tide ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/tide ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MX11} - ${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xtide.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/xtide ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/xtide.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endif - ${INSTALL_PROGRAM} ${WRKSRC}/xttpd ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/tide.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/xttpd.8 ${MAN8PREFIX}/man/man8 - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/harmonics.tcd ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/xtide.conf.example ${PREFIX}/etc + ${INSTALL_PROGRAM} ${WRKSRC}/xttpd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/tide.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/xttpd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/harmonics.tcd ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/xtide.conf.example ${STAGEDIR}${PREFIX}/etc post-install: -.if !exists(${PREFIX}/etc/xtide.conf) - ${INSTALL_DATA} ${WRKDIR}/xtide.conf.example ${PREFIX}/etc/xtide.conf - ${CHMOD} 644 ${PREFIX}/etc/xtide.conf -.endif - .if ${PORT_OPTIONS:MWVS} - @${MKDIR} ${DATADIR}/wvs - ${INSTALL_DATA} ${WRKDIR}/wvs1.dat ${DATADIR}/wvs - ${INSTALL_DATA} ${WRKDIR}/wvs12.dat ${DATADIR}/wvs - ${INSTALL_DATA} ${WRKDIR}/wvs250k.dat ${DATADIR}/wvs - ${INSTALL_DATA} ${WRKDIR}/wvs3.dat ${DATADIR}/wvs - ${INSTALL_DATA} ${WRKDIR}/wvs43.dat ${DATADIR}/wvs - ${INSTALL_DATA} ${WRKDIR}/wvsfull.dat ${DATADIR}/wvs + @${MKDIR} ${STAGEDIR}${DATADIR}/wvs + ${INSTALL_DATA} ${WRKDIR}/wvs1.dat ${STAGEDIR}${DATADIR}/wvs + ${INSTALL_DATA} ${WRKDIR}/wvs12.dat ${STAGEDIR}${DATADIR}/wvs + ${INSTALL_DATA} ${WRKDIR}/wvs250k.dat ${STAGEDIR}${DATADIR}/wvs + ${INSTALL_DATA} ${WRKDIR}/wvs3.dat ${STAGEDIR}${DATADIR}/wvs + ${INSTALL_DATA} ${WRKDIR}/wvs43.dat ${STAGEDIR}${DATADIR}/wvs + ${INSTALL_DATA} ${WRKDIR}/wvsfull.dat ${STAGEDIR}${DATADIR}/wvs .endif .include Modified: head/astro/xtide/distinfo ============================================================================== --- head/astro/xtide/distinfo Wed Oct 16 05:05:52 2013 (r330479) +++ head/astro/xtide/distinfo Wed Oct 16 05:48:29 2013 (r330480) @@ -1,7 +1,7 @@ -SHA256 (xtide-2.13.1.tar.bz2) = f537377223ebc073998bbf2c7c475e57374ee60a638e29d029f84ba01fb6f365 -SIZE (xtide-2.13.1.tar.bz2) = 476238 -SHA256 (libtcd-2.2.5.tar.bz2) = 83d8b5661673eb841417e9aa7b14b3c1d233a6adf836c7d21805ff376165a1d6 -SIZE (libtcd-2.2.5.tar.bz2) = 271494 +SHA256 (xtide-2.13.2.tar.bz2) = fabf6b3097bb345598649ea55d1f2db269cbb651cddd73c60a9768088173d542 +SIZE (xtide-2.13.2.tar.bz2) = 481183 +SHA256 (libtcd-2.2.5-r3.tar.bz2) = f837aa45421236732580e6fa73b79f539b9e778bebe22dbd3ca43b2c6a550e9e +SIZE (libtcd-2.2.5-r3.tar.bz2) = 300804 SHA256 (harmonics-dwf-20121224-free.tar.bz2) = d80d7e99181c60a42660392abbe25789c395453dd88944c41dc19c7f4b0f11be SIZE (harmonics-dwf-20121224-free.tar.bz2) = 508967 SHA256 (wvs.tar.bz2) = 4e996ce2e608d612ba78e35cdf50c2c73b01fce06bd5b561a7fe957ea75d6d75 Modified: head/astro/xtide/pkg-plist ============================================================================== --- head/astro/xtide/pkg-plist Wed Oct 16 05:05:52 2013 (r330479) +++ head/astro/xtide/pkg-plist Wed Oct 16 05:48:29 2013 (r330480) @@ -1,6 +1,9 @@ bin/tide %%X11%%bin/xtide bin/xttpd +man/man1/tide.1.gz +%%X11%%man/man1/xtide.1.gz +man/man8/xttpd.8.gz %%DATADIR%%/harmonics.tcd %%WVS%%%%DATADIR%%/wvs/wvs1.dat %%WVS%%%%DATADIR%%/wvs/wvs12.dat @@ -10,6 +13,6 @@ bin/xttpd %%WVS%%%%DATADIR%%/wvs/wvsfull.dat %%WVS%%@dirrm %%DATADIR%%/wvs @dirrm %%DATADIR%% -@unexec if cmp -s %D/etc/xtide.conf.example %D/etc/xtide.conf; then rm -f %D/etc/xtide.conf; fi +@unexec if cmp -s %D/etc/xtide.conf %D/etc/xtide.conf.example ; then rm -f %D/etc/xtide.conf ; fi etc/xtide.conf.example -@exec if [ ! -f %D/etc/xtide.conf ] ; then cp -p %D/%F %B/xtide.conf; fi +@exec if [ ! -f %D/etc/xtide.conf ]; then cp -p %D/%F %B/xtide.conf; fi