Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Oct 2012 09:23:15 +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: r306302 - head/misc/wmweather+
Message-ID:  <201210230923.q9N9NFJ8028990@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Oct 23 09:23:15 2012
New Revision: 306302
URL: http://svn.freebsd.org/changeset/ports/306302

Log:
  Convert to new options framework
  
  Feature safe:	yes

Modified:
  head/misc/wmweather+/Makefile

Modified: head/misc/wmweather+/Makefile
==============================================================================
--- head/misc/wmweather+/Makefile	Tue Oct 23 09:08:46 2012	(r306301)
+++ head/misc/wmweather+/Makefile	Tue Oct 23 09:23:15 2012	(r306302)
@@ -1,5 +1,4 @@
 # Created by: Harald Wille <harald.wille@students.jku.at>
-#
 # $FreeBSD$
 
 PORTNAME=		wmweather+
@@ -30,17 +29,19 @@ CONFIGURE_ARGS+=	--with-libwraster=${LOC
 			--with-xpm-includes=${LOCALBASE} \
 			--with-xpm-libraries=${LOCALBASE}
 
-OPTIONS=	WM "Depend on Window Maker port (otherwise only libwraster)" on
+OPTIONS_DEFINE=	WM EXAMPLES
+OPTIONS_DEFAULT=	WM
+WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
 
 MAN1=		wmweather+.1
 
 PLIST_FILES=	bin/wmweather+
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CFLAGS:=	${CFLAGS:C/-O[0-9]/-O0/}
 
-.if !defined(WITHOUT_WM)
+.if ${PORT_OPTIONS:MWM}
 LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/windowmaker
 .else
 LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/libwraster
@@ -56,7 +57,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmweather+ ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/wmweather+.1 ${PREFIX}/man/man1
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/HINTS ${EXAMPLESDIR}/HINTS
 	${INSTALL_DATA} ${WRKSRC}/example.conf ${EXAMPLESDIR}/example.conf
@@ -68,7 +69,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO} "===================================================" > ${PM}
 	@${ECHO} "A sample configuration file has been copied to" >> ${PM}
 	@${ECHO} "${EXAMPLESDIR}/example.conf" >> ${PM}
@@ -79,4 +80,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .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?201210230923.q9N9NFJ8028990>