Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Jan 2016 21:33:58 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406880 - head/astro/xtide
Message-ID:  <201601212133.u0LLXwo6092255@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601212133.u0LLXwo6092255>