From owner-svn-ports-all@FreeBSD.ORG Fri Jun 7 05:36:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 09E3DE95; Fri, 7 Jun 2013 05:36:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F04CC1A1D; Fri, 7 Jun 2013 05:36:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r575aUx0063322; Fri, 7 Jun 2013 05:36:30 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r575aUZo063320; Fri, 7 Jun 2013 05:36:30 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201306070536.r575aUZo063320@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 7 Jun 2013 05:36:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320146 - in head: misc/gnome2-reference x11/xscreensaver-gnome X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jun 2013 05:36:31 -0000 Author: bapt Date: Fri Jun 7 05:36:30 2013 New Revision: 320146 URL: http://svnweb.freebsd.org/changeset/ports/320146 Log: Convert to new options framework Modified: head/misc/gnome2-reference/Makefile head/x11/xscreensaver-gnome/Makefile Modified: head/misc/gnome2-reference/Makefile ============================================================================== --- head/misc/gnome2-reference/Makefile Fri Jun 7 05:33:07 2013 (r320145) +++ head/misc/gnome2-reference/Makefile Fri Jun 7 05:36:30 2013 (r320146) @@ -54,17 +54,21 @@ REF_LIST= accessibility/at-spi-reference NO_BUILD= yes +.MAKE.FreeBSD_UL= yes + REF_LIST_INC= ${.CURDIR}/Makefile.inc .include "${REF_LIST_INC}" -.include - .for ref in ${_PORT_REF_LIST:C/^([^:]+).*/\1/} -OPTIONS+= ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U} "Install ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//} programing reference " on +OPTIONS_DEFINE+= ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U} +OPTIONS_DEFAULT+= ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U} +${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U}_DESC= Install ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//} programing reference .endfor +.include + .for ref in ${_PORT_REF_LIST} -.if !defined(WITHOUT_${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U:C/^([^:]+).*/\1/}) +.if ${PORT_OPTIONS:M${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U:C/^([^:]+).*/\1/}} RUN_DEPENDS+= ${ref:C|^[^:]+:([^:]+).*|\1|:C|^[^/]+/([^/]+).*|\1|}>0:${PORTSDIR}/${ref:C/^([^:]+).*/\1/} .endif .endfor @@ -78,4 +82,4 @@ create-ref-list: (cd ${PORTSDIR}/${port} && ${ECHO_CMD} "${port}:`${MAKE} -V PORTNAME` \\" >> ${REF_LIST_INC}) .endfor -.include +.include Modified: head/x11/xscreensaver-gnome/Makefile ============================================================================== --- head/x11/xscreensaver-gnome/Makefile Fri Jun 7 05:33:07 2013 (r320145) +++ head/x11/xscreensaver-gnome/Makefile Fri Jun 7 05:36:30 2013 (r320146) @@ -1,10 +1,6 @@ -# New ports collection makefile for: xscreensaver-gnome -# Date created: 13th February 2002 -# Whom: Ade Lovett -# +# Created by: Ade Lovett # $FreeBSD$ # $MCom: ports/x11/xscreensaver-gnome/Makefile,v 1.5 2007/08/15 18:29:16 mezz Exp $ -# PORTNAME?= xscreensaver-gnome PORTVERSION= 5.12 @@ -38,10 +34,11 @@ CONFIGURE_ENV= LIBS="-lintl" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS?= PAM "Pluggable Authentication Module support" on \ - KEYRING "Enable GnomeKeyring integration (needs PAM)" on \ - ALL_FORTUNES "Enable support for all fortunes" off \ - SETUID_HACKS "Install sonar hack suid so it can ping" off +OPTIONS_DEFINE= PAM KEYRING ALL_FORTUNES SETUID_HACKS +OPTIONS_DEFAULT= PAM KEYRING +KEYRING_DESC= GnomeKeyring integration (needs PAM) +ALL_FORTUNES_DESC= Support for all fortunes +SETUID_HACKS_DESC= Install sonar hack suid so it can ping SUB_FILES+= xscreensaver.pam @@ -88,11 +85,11 @@ MAN6?= anemone.6 anemotaxis.6 antinspect .include -.if defined(WITH_ALL_FORTUNES) +.if ${PORT_OPTIONS:MALL_FORTUNES} CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa" .endif -.if defined(WITH_PAM) || defined(WITH_KEYRING) +.if ${PORT_OPTIONS:MPAM} || ${PORT_OPTIONS:MKEYRING} CONFIGURE_ARGS+= --with-pam PLIST_SUB+= PAM="" .else @@ -100,14 +97,14 @@ CONFIGURE_ARGS+= --without-pam PLIST_SUB+= PAM="@comment " .endif -.if defined(WITH_KEYRING) +.if ${PORT_OPTIONS:MKEYRING} SUB_LIST+= PAM_KEYRING= RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring .else SUB_LIST+= PAM_KEYRING=\# .endif -.if defined(WITH_SETUID_HACKS) +.if ${PORT_OPTIONS:MSETUID_HACKS} CONFIGURE_ARGS+= --with-setuid-hacks .endif @@ -121,7 +118,7 @@ post-patch: s|malloc.h|stdlib.h|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} .for f in driver/passwd-pam.c driver/xscreensaver.man @${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \ ${WRKSRC}/${f} @@ -136,7 +133,7 @@ pre-build: @(cd ${WRKSRC}/hacks/glx && ./molecules.sh molecules.h ../images/molecules/*.pdb) pre-install: -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} @${CP} ${WRKDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam .endif