Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Nov 2012 22:57:36 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307628 - head/x11/tint
Message-ID:  <201211212257.qALMvalw047102@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Nov 21 22:57:36 2012
New Revision: 307628
URL: http://svnweb.freebsd.org/changeset/ports/307628

Log:
  Convert to new options framework
  
  Feature safe:	yes

Modified:
  head/x11/tint/Makefile

Modified: head/x11/tint/Makefile
==============================================================================
--- head/x11/tint/Makefile	Wed Nov 21 22:50:04 2012	(r307627)
+++ head/x11/tint/Makefile	Wed Nov 21 22:57:36 2012	(r307628)
@@ -26,15 +26,17 @@ PLIST_FILES=	bin/tint2 \
 		share/tint2/default_icon.png
 PLIST_DIRS=	share/tint2
 
-OPTIONS=	PYCONF "Configuration editing tool (req. python)" on
+OPTIONS_DEFINE=	PYCONF DOCS EXAMPLES
+OPTIONS_DEFAULT=	PYCONF
+PYCONF_DESC=	Configuration editing tool (req. python)
 
 MAN1=		tint2.1
 
 PORTDOCS=	AUTHORS ChangeLog README
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PYCONF)
+.if ${PORT_OPTIONS:MPYCONF}
 USE_PYTHON=	yes
 USE_GNOME=	gtk20 pygtk2
 CMAKE_ARGS+=	-DENABLE_TINT2CONF:BOOL=ON
@@ -47,7 +49,7 @@ PYCONF_SRC=	${WRKSRC}/src/tint2conf
 CMAKE_ARGS+=	-DENABLE_TINT2CONF:BOOL=OFF
 .endif
 
-.if !defined(WITHOUT_PYCONF)
+.if ${PORT_OPTIONS:MPYCONF}
 post-patch:
 	@${MV} ${PYCONF_SRC}/tintwizard.py ${PYCONF_SRC}/tintwizard.py.Dist
 	@${SED} -e 's#pidof#pgrep#g' ${PYCONF_SRC}/tintwizard.py.Dist \
@@ -59,7 +61,7 @@ do-install:
 	${MKDIR} ${PREFIX}/share/tint2
 	${INSTALL_DATA} ${WRKSRC}/default_icon.png ${PREFIX}/share/tint2
 	${INSTALL_MAN} ${WRKSRC}/doc/tint2.1 ${MANPREFIX}/man/man1
-.if defined(WITH_PYCONF)
+.if ${PORT_OPTIONS:MPYCONF}
 	${INSTALL_PROGRAM} ${PYCONF_SRC}/tint2conf ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PYCONF_SRC}/tintwizard.py ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/share/applications
@@ -67,13 +69,13 @@ do-install:
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.png ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${PYCONF_SRC}/tint2conf.svg ${PREFIX}/share/pixmaps
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	@for file in ${RCS}; do \
 	${INSTALL_DATA} ${WRKSRC}/sample/$${file} ${EXAMPLESDIR}; \
@@ -85,4 +87,4 @@ PLIST_FILES+=	${EXAMPLESDIR_REL}/${file}
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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