Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Mar 2017 09:01:53 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436044 - head/games/gtklife
Message-ID:  <201703130901.v2D91r2S049872@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Mar 13 09:01:53 2017
New Revision: 436044
URL: https://svnweb.freebsd.org/changeset/ports/436044

Log:
  - Add LICENSE_FILE
  - Switch to options helpers

Modified:
  head/games/gtklife/Makefile

Modified: head/games/gtklife/Makefile
==============================================================================
--- head/games/gtklife/Makefile	Mon Mar 13 08:46:45 2017	(r436043)
+++ head/games/gtklife/Makefile	Mon Mar 13 09:01:53 2017	(r436044)
@@ -11,11 +11,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ implementation of Conways Game of Life
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-WANT_GNOME=	yes
-INSTALLS_ICONS=	yes
 USES=		gmake
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" docdir="${DOCSDIR}"
+INSTALLS_ICONS=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
@@ -30,34 +30,30 @@ DESKTOP_ENTRIES="GtkLife" \
 		"Game;Simulation;" \
 		${STARTUP_NOTIFY}
 
-OPTIONS_DEFINE=	GTK2
-GTK2_DESC=	GTK2 gui toolkit support (beta)
-
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	GTK2 DOCS
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-MAKE_ARGS+=	gtk2=yes
-STARTUP_NOTIFY=	true
-.else
-USE_GNOME+=	gtk12
-STARTUP_NOTIFY=	false
-.endif
+GTK2_DESC=	GTK2 gui toolkit support (beta)
+GTK2_USE=	GNOME=gtk20 XORG=x11
+GTK2_USE_OFF=	GNOME=gtk12
+GTK2_MAKE_ARGS=	gtk2=yes
+GTK2_LDFLAGS=	-lX11
+GTK2_VARS=	STARTUP_NOTIFY=true
+GTK2_VARS_OFF=	STARTUP_NOTIFY=false
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gtklife ${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC} && \
-	${FIND} ${DATA_SUBDIRS} -type d ! -empty -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
-	${FIND} ${DATA_SUBDIRS} ! -type d -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/{}" \;
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 .for s in ${ICON_SIZES}
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/icon_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/gtklife.png
 .endfor
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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