From owner-svn-ports-head@freebsd.org Thu Jan 21 21:33:59 2016 Return-Path: <owner-svn-ports-head@freebsd.org> Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9500AA8C116; Thu, 21 Jan 2016 21:33:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C7E5100B; Thu, 21 Jan 2016 21:33:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LLXwAK092256; Thu, 21 Jan 2016 21:33:58 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LLXwo6092255; Thu, 21 Jan 2016 21:33:58 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601212133.u0LLXwo6092255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala <pawel@FreeBSD.org> Date: Thu, 21 Jan 2016 21:33:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406880 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head <svn-ports-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/> List-Post: <mailto:svn-ports-head@freebsd.org> List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>, <mailto:svn-ports-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 21 Jan 2016 21:33:59 -0000 Author: pawel Date: Thu Jan 21 21:33:58 2016 New Revision: 406880 URL: https://svnweb.freebsd.org/changeset/ports/406880 Log: - Convert to USES=localbase - Add LICENSE_FILE - Use options helper for desktop entry, also don't use full path for the icon, desktop entry spec discourages this if the icon is in searched pixmap directories Modified: head/astro/xtide/Makefile Modified: head/astro/xtide/Makefile ============================================================================== --- head/astro/xtide/Makefile Thu Jan 21 21:11:52 2016 (r406879) +++ head/astro/xtide/Makefile Thu Jan 21 21:33:58 2016 (r406880) @@ -13,10 +13,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Harmonic tide clock and tide predictor LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= compiler:c++0x gmake libtool tar:bzip2 +USES= compiler:c++0x gmake libtool localbase tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_tcd_h=yes \ ac_cv_lib_tcd_get_tide_db_header=yes @@ -24,10 +25,8 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes CFLAGS+= -Wno-deprecated-declarations -CPPFLAGS+= -I${TCD_WRKSRC} $$(libpng-config --I_opts) \ - -I${LOCALBASE}/include -LDFLAGS+= -L${TCD_WRKSRC}/.libs $$(libpng-config --L_opts) \ - -L${LOCALBASE}/lib +CPPFLAGS+= -I${TCD_WRKSRC} $$(libpng-config --I_opts) +LDFLAGS+= -L${TCD_WRKSRC}/.libs $$(libpng-config --L_opts) OPTIONS_DEFINE= WVS X11 OPTIONS_DEFAULT= X11 @@ -37,6 +36,7 @@ WVS_DESC= Use world vector shoreline da WVS_DISTFILES= ${WVS_DISTNAME}${EXTRACT_SUFX} X11_USE= xorg=xaw,xpm X11_CONFIGURE_WITH= x +X11_DESKTOP_ENTRIES= "XTide" "" "xtide" "xtide" "" "" TCD_DISTNAME= libtcd-2.2.6-r2 TCD_WRKSRC= ${WRKDIR}/${TCD_DISTNAME:C/-r[0-9]+//} @@ -44,12 +44,6 @@ HARM_DISTNAME= harmonics-dwf-20141224-fr HARM_WRKSRC= ${WRKDIR}/${HARM_DISTNAME:C/-free//} WVS_DISTNAME= wvs -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MX11} -DESKTOP_ENTRIES="XTide" "" "${PREFIX}/share/pixmaps/xtide.png" "xtide" "" "" -.endif - post-patch: @${REINPLACE_CMD} -e \ '/if test/s|==|=|g' ${TCD_WRKSRC}/configure