Date: Tue, 4 Jun 2013 06:34:05 +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: r319824 - in head/net: mpd5 mpich2 netatalk ngrep openser openslp rubygem-rightaws spserver tightvnc vnc Message-ID: <201306040634.r546Y5x5061443@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Jun 4 06:34:05 2013 New Revision: 319824 URL: http://svnweb.freebsd.org/changeset/ports/319824 Log: Convert to new options framework While here trim parts related to unsupported FreeBSD versions Modified: head/net/mpd5/Makefile head/net/mpich2/Makefile head/net/netatalk/Makefile head/net/netatalk/pkg-plist head/net/ngrep/Makefile head/net/openser/Makefile head/net/openslp/Makefile head/net/rubygem-rightaws/Makefile head/net/spserver/Makefile head/net/tightvnc/Makefile head/net/vnc/Makefile Modified: head/net/mpd5/Makefile ============================================================================== --- head/net/mpd5/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/mpd5/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mpd -# Date created: 20 Sep 2005 -# Whom: Archie Cobbs -# +# Created by: Archie Cobbs # $FreeBSD$ -# PORTNAME= mpd DISTVERSION= 5.6 @@ -16,26 +12,17 @@ COMMENT= Multi-link PPP daemon based on LATEST_LINK= mpd5 -OPTIONS= NG_CAR "Use ng_car kernel module from port (< 7.0 only)" off\ - NG_IPACCT "Use ng_ipacct kernel module from port" off +OPTIONS_DEFINE= NG_IPACCT +NG_IPACCT_DESC= Use ng_ipacct kernel module from port HAS_CONFIGURE= YES CONFIGURE_WRKSRC= "${WRKSRC}/src" USE_OPENSSL= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${OSVERSION} < 700041 && defined(WITH_NG_CAR) -BUILD_DEPENDS+= ${LOCALBASE}/include/netgraph/ng_car.h:${PORTSDIR}/net/ng_car -.if exists(${KMODDIR}/ng_car.ko) -RUN_DEPENDS+= ${KMODDIR}/ng_car.ko:${PORTSDIR}/net/ng_car -.else -RUN_DEPENDS+= /boot/modules/ng_car.ko:${PORTSDIR}/net/ng_car -.endif -.endif - -.if defined(WITH_NG_IPACCT) +.if ${PORT_OPTIONS:MNG_IPACCT} BUILD_DEPENDS+= ${LOCALBASE}/include/netgraph/ng_ipacct.h:${PORTSDIR}/net-mgmt/ng_ipacct .if exists(${KMODDIR}/ng_ipacct.ko) RUN_DEPENDS+= ${KMODDIR}/ng_ipacct.ko:${PORTSDIR}/net-mgmt/ng_ipacct @@ -55,4 +42,4 @@ PORTDOCS= ${HTMLNUM:S/^/mpd/:S/$/.html/} PLIST_DIRS= etc/mpd5 PLIST_FILES= ${CONFSUF:S/^/etc\/mpd5\/mpd./:S/$/.sample/} sbin/mpd5 -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/mpich2/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -28,9 +28,15 @@ USE_LDCONFIG= yes USE_PERL5_BUILD=yes USE_PYTHON= yes -OPTIONS= JAVA "build MPE Jumpshot-4" on \ - SMPD "use SMPD instead of MPD, for a mixed-OS cluster" off \ - X11 "build MPE graphics routines" on +OPTIONS_DEFINE_i386= JAVA +OPTIONS_DEFINE_amd64= JAVA +OPTIONS_DEFINE= SMPD X11 DOCS +OPTIONS_DEFAULT_i386= JAVA +OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_DEFAULT= X11 +JAVA_DESC= build MPE Jumpshot-4 +SMPD_DESC= use SMPD instead of MPD, for a mixed-OS cluster +X11_DESC= build MPE graphics routines CONFIGURE_ARGS= --enable-romio --enable-shared \ --docdir="${DOCSDIR}" @@ -57,20 +63,16 @@ SUB_FILES= pkg-message .include <bsd.port.options.mk> -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= VERBOSE=1 .endif -.if !(${ARCH} == "amd64" || ${ARCH} == "i386") -WITHOUT_JAVA= no_java_available_for_${ARCH} -.endif - -.if defined(WITHOUT_JAVA) +.if ! ${PORT_OPTIONS:MJAVA} CONFIGURE_ARGS+= --without-java PLIST_SUB+= JAVA="@comment " PLX11= "@comment " .else -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} IGNORE = WITH_JAVA requires WITH_X11 .endif CONFIGURE_ARGS+= --with-java="${JAVA_HOME}" @@ -90,7 +92,7 @@ WITH_RECV_TIMEOUT?= 100 WITH_RECV_TIMEOUT?= 20 .endif -.if defined(WITH_SMPD) +.if ${PORT_OPTIONS:MSMPD} CONFIGURE_ARGS+= --with-pmi=smpd --with-pm=smpd PLIST_SUB+= PM_MPD="@comment " PM_SMPD="" .else @@ -98,7 +100,7 @@ CONFIGURE_ARGS+= --with-pmi=simple --wit PLIST_SUB+= PM_MPD="" PM_SMPD="@comment " .endif -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --disable-graphics PLIST_SUB+= X11="@comment " .else @@ -109,7 +111,7 @@ PLIST_SUB+= X11=${PLX11} .include <bsd.port.pre.mk> -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} .include "${FILESDIR}/manpages" .endif @@ -133,13 +135,13 @@ pre-configure: ${FIND} ${WRKSRC} -name configure | ${XARGS} \ ${REINPLACE_CMD} -e 's|doc/$${PACKAGE}|doc/${PORTNAME}|' .for fin in ${DOC2PATCH} -. if defined(NOPORTDOCS) - ${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin} -. else +. if ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's|%%PORTDOCS%%||' ${WRKSRC}/${fin} +. else + ${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin} . endif .endfor -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's|lib doc share|lib share|' \ ${WRKSRC}/src/mpe2/src/slog2sdk/sbin/install-package.in .endif Modified: head/net/netatalk/Makefile ============================================================================== --- head/net/netatalk/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/netatalk/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -30,14 +30,14 @@ CONFIGURE_ARGS+= --with-tcp-wrappers \ --with-uams-path=${PREFIX}/libexec/netatalk-uams \ --with-bdb=${LOCALBASE} -OPTIONS= APPLETALK "Enable AppleTalk protocol support" on \ - SRVLOC "Enable Service Location Protocol support" off \ - PAM "Enable PAM support" off \ - TIMELORD "Enable Timelord network time service" off \ - KRB5 "Enable Kerberos V UAM" off \ - ZEROCONF "Enable Zeroconf (Bonjour) support" on \ - LDAP "Enable LDAP support" off \ - SENDFILE "Enable sendfile support" off +OPTIONS_DEFINE= APPLETALK SRVLOC PAM TIMELORD KRB5 ZEROCONF LDAP SENDFILE +OPTIONS_DEFAULT= APPLETALK +APPLETALK_DESC= AppleTalk protocol support +SRVLOC_DESC= Service Location Protocol support +TIMELORD_DESC= Timelord network time service +KRB5_DESC= Kerberos V UAM +ZEROCONF_DESC= Zeroconf (Bonjour) support +SENDFILE_DESC= sendfile support FILES= AppleVolumes.default AppleVolumes.system afpd.conf netatalk.conf LINKS= unbin unhex unsingle hqx2bin single2bin macbinary \ @@ -53,16 +53,16 @@ MAN8= afpd.8 cnid_dbd.8 cnid_metad.8 ti CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-1* yudit-[0-9]* -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_KRB5) +.if ${PORT_OPTIONS:MKRB5} CONFIGURE_ARGS+= --enable-krbV-uam PLIST_SUB+= NETATALKKRB5="" .else PLIST_SUB+= NETATALKKRB5="@comment " .endif -.if defined(WITH_APPLETALK) +.if ${PORT_OPTIONS:MAPPLETALK} CONFIGURE_ARGS+= --enable-ddp PLIST_SUB+= APPLETALK="" MAN1+= aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 \ @@ -76,7 +76,7 @@ FILES+= atalkd.conf papd.conf PLIST_SUB+= APPLETALK="@comment " .endif -.if defined(WITH_PAM) +.if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --with-pam PLIST_SUB+= NETATALKPAM="" .else @@ -84,7 +84,7 @@ CONFIGURE_ARGS+= --without-pam PLIST_SUB+= NETATALKPAM="@comment " .endif -.if defined(WITH_SRVLOC) +.if ${PORT_OPTIONS:MSRVLOC} CONFIGURE_ARGS+= --enable-srvloc=${LOCALBASE} LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp SUB_LIST+= SRVLOC="slpd" @@ -92,14 +92,14 @@ SUB_LIST+= SRVLOC="slpd" SUB_LIST+= SRVLOC="" .endif -.if defined (WITH_TIMELORD) +.if ${PORT_OPTIONS:MTIMELORD} CONFIGURE_ARGS+= --enable-timelord PLIST_SUB+= TIMELORD="" .else PLIST_SUB+= TIMELORD="@comment " .endif -.if defined (WITH_ZEROCONF) +.if ${PORT_OPTIONS:MZEROCONF} CONFIGURE_ARGS+= --enable-zeroconf=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app @@ -110,7 +110,7 @@ CONFIGURE_ARGS+= --disable-zerconf SUB_LIST+= ZEROCONF="" .endif -.if defined (WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --with-ldap CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib USE_OPENLDAP= yes @@ -118,18 +118,12 @@ USE_OPENLDAP= yes CONFIGURE_ARGS+= --without-ldap .endif -.if defined (WITH_SENDFILE) +.if ${PORT_OPTIONS:MSENDFILE} CONFIGURE_ARGS+= --enable-sendfile .else CONFIGURE_ARGS+= --disable-sendfile .endif -.if ${OSVERSION} < 800031 -PLIST_SUB+= ATFUNCS="@comment " -.else -PLIST_SUB+= ATFUNCS="" -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ @@ -151,4 +145,4 @@ post-install: .endfor @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/netatalk/pkg-plist ============================================================================== --- head/net/netatalk/pkg-plist Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/netatalk/pkg-plist Tue Jun 4 06:34:05 2013 (r319824) @@ -1,4 +1,3 @@ -%%ATFUNCS%%bin/ad %%APPLETALK%%bin/add_netatalk_printer bin/adv1tov2 %%APPLETALK%%bin/aecho Modified: head/net/ngrep/Makefile ============================================================================== --- head/net/ngrep/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/ngrep/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: ngrep -# Date created: Sat Jan 01, 2000 -# Whom: David O'Brien (obrien@NUXI.com) -# +# Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -# PORTNAME= ngrep PORTVERSION= 1.45 @@ -22,9 +17,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-pcap-restart MAKE_JOBS_UNSAFE= yes -OPTIONS= PCRE "Use PCRE instead of GNU regex" on \ - PORTS_PCAP "Use ports PCAP instead of system PCAP" off \ - IPV6 "Enable IPv6 support" on +OPTIONS_DEFINE= PCRE PORTS_PCAP IPV6 DOCS +OPTIONS_DEFAULT= PCRE +PCRE_DESC= Use PCRE instead of GNU regex +PORTS_PCAP_DESC= Use ports PCAP instead of system PCAP MAN8= ngrep.8 PLIST_FILES= bin/ngrep @@ -32,31 +28,31 @@ PLIST_FILES= bin/ngrep PORTDOCS= CHANGES.txt CREDITS.txt INSTALL.txt LICENSE.txt \ README.txt REGEX.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PCRE) +.if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+= --enable-pcre .endif -.if !defined(WITH_PORTS_PCAP) -CONFIGURE_ARGS+= --with-pcap-includes=/usr/include -.else +.if ${PORT_OPTIONS:MPORTS_PCAP} CONFIGURE_ARGS+= --with-pcap-includes=${LOCALBASE}/include BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap +.else +CONFIGURE_ARGS+= --with-pcap-includes=/usr/include .endif -.if !defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif post-patch: -.if defined(WITH_PORTS_PCAP) +.if ${PORT_OPTIONS:MPORTS_PCAP} @${REINPLACE_CMD} -e "s|-lpcap|${LOCALBASE}/lib/libpcap.a|g" \ ${WRKSRC}/Makefile.in ${WRKSRC}/configure .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} @if [ -f ${WRKSRC}/${file} ]; then \ @@ -67,4 +63,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/openser/Makefile ============================================================================== --- head/net/openser/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/openser/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,9 +1,5 @@ -# New ports collection makefile for: openser -# Date created: 20 October 2005 -# Whom: jesusr -# +# Created by: jesusr # $FreeBSD$ -# PORTNAME= openser PORTVERSION= 1.2.3 @@ -59,16 +55,14 @@ PORTDOCS= * SUB_FILES= pkg-install pkg-deinstall SUB_LIST= RC_DIRS="${RC_DIRS}" RC_FILES="${RC_FILES}" -OPTIONS= MYSQL "MySQL support" on \ - POSTGRESQL "PostgreSQL support" off \ - UNIXODBC "UnixODBC support" off \ - TLS "TLS support" off \ - SNMPSTATS "SNMPStats support" off \ - AUTHRADIUS "auth_radius module" off +OPTIONS_DEFINE= MYSQL PGSQL UNIXODBC TLS SNMPSTATS AUTHRADIUS +OPTIONS_DEFAULT= MYSQL +SNMPSTATS_DESC= SNMPStats support +AUTHRADIUS_DESC= auth_radius module -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes MODULES+= mysql PLIST_FILES+= lib/openser/openserctl/openserctl.mysql sbin/openser_mysql.sh @@ -76,22 +70,22 @@ PLIST_FILES+= lib/openser/openserctl/ope MAKE_ENV+= MYSQL=mysql .endif -.if defined(WITH_POSTGRESQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes MODULES+= postgres PLIST_FILES+= lib/openser/openserctl/openserctl.pgsql sbin/openser_postgresql.sh .else -MAKE_ENV+= POSTGRESQL=postgres +MAKE_ENV+= PGSQL=postgres .endif -.if defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC MODULES+= unixodbc .else MAKE_ENV+= UNIXODBC=unixodbc .endif -.if defined(WITH_TLS) +.if ${PORT_OPTIONS:MTLS} MODULES+= tlsops .include "${PORTSDIR}/Mk/bsd.openssl.mk" TLS_RC_FILES= tls/rootCA/cacert.pem \ @@ -119,14 +113,14 @@ MAKE_ENV+= TLSOPS=tlsops MAKE_ARGS+= TLS="" .endif -.if defined(WITH_SNMPSTATS) +.if ${PORT_OPTIONS:MSNMPSTATS} RUN_DEPENDS+= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp MODULES+= snmpstats .else MAKE_ENV+= SNMPSTATS=snmpstats .endif -.if defined(WITH_AUTHRADIUS) +.if ${PORT_OPTIONS:MAUTHRADIUS} MODULES+= auth_radius PLIST_FILES+= lib/openser/modules/auth_radius.so .else @@ -137,7 +131,7 @@ PLIST_FILES+= ${MODULES:S|^|lib/openser/ ${RC_FILES:S|^|etc/openser/|:S|$|.default|} post-patch: -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|install-doc install-man|install-man|' \ ${WRKSRC}/Makefile .endif @@ -176,4 +170,4 @@ post-install: .endfor @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/openslp/Makefile ============================================================================== --- head/net/openslp/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/openslp/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,9 +1,5 @@ -# New ports collection makefile for: OpenSLP 1.0 -# Date created: 15 Sep 2001 -# Whom: Joe Clarke -# +# Created by: Joe Clarke # $FreeBSD$ -# PORTNAME= openslp PORTVERSION= 1.2.1 @@ -23,16 +19,17 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e USE_RC_SUBR= slpd -OPTIONS= SLP_SECURITY "Turn on SLPv2 security support" off \ - ASYNC_API "Enable asynchronous communication API" off +OPTIONS_DEFINE= SLP_SECURITY ASYNC_API DOCS +SLP_SECURITY_DESC= Turn on SLPv2 security support +ASYNC_API_DESC= Enable asynchronous communication API -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SLP_SECURITY) +.if ${PORT_OPTIONS:MSLP_SECURITY} CONFIGURE_ARGS+= --enable-slpv2-security .endif -.if defined(WITH_ASYNC_API) +.if ${PORT_OPTIONS:MASYNC_API} CONFIGURE_ARGS+= --enable-async-api .endif @@ -45,11 +42,11 @@ post-install: .for FILE in slp.conf slp.reg slp.spi ${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${PREFIX}/etc/openslp/${FILE}.default .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} (cd ${INSTALL_WRKSRC}/doc; \ ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; ;\ ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;) .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/rubygem-rightaws/Makefile ============================================================================== --- head/net/rubygem-rightaws/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/rubygem-rightaws/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,9 +1,5 @@ -# Ports collection makefile for: rubygem-rightaws -# Date created: 01 May 2008 -# Whom: Greg Larkin <glarkin@FreeBSD.org> -# +# Created by: Greg Larkin <glarkin@FreeBSD.org> # $FreeBSD$ -# PORTNAME= rightaws PORTVERSION= 1.10.0 @@ -23,14 +19,15 @@ GEM_NAME= ${DISTNAME} RUBYGEM_AUTOPLIST= yes UNIQUENAME= ${PORTNAME} -OPTIONS= LIBXML "Use libxml instead of REXML" Off +OPTIONS_DEFINE= LIBXML +LIBXML_DESC= Use libxml instead of REXML -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_LIBXML) +.if ${PORT_OPTIONS:MLIBXML} RUN_DEPENDS+= rubygem-libxml-ruby>=2.3.3:${PORTSDIR}/textproc/rubygem-libxml-ruby .else USE_RUBY_FEATURES= rexml .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/spserver/Makefile ============================================================================== --- head/net/spserver/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/spserver/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,9 +1,5 @@ -# New ports collection makefile for: spserver -# Date created: 18 June 2007 -# Whom: vanilla@ -# +# Created by: vanilla@ # $FreeBSD$ -# PORTNAME= spserver PORTVERSION= 0.9.5 @@ -22,13 +18,13 @@ USE_LDCONFIG= yes USE_GMAKE= yes ALL_TARGET= all build_openssl -OPTIONS= GNUTLS "Enable gnutls support" off +OPTIONS_DEFINE= GNUTLS # MATRIXSSL "Enable matrixssl support" off \ # XYSSL "Enable xyssl support" off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_MATRIXSSL) +.if ${PORT_OPTIONS:MMATRIXSSL} BUILD_DEPENDS= ${PREFIX}/lib/libmatrixsslstatic.a:${PORTSDIR}/security/matrixssl ALL_TARGET+= build_matrixssl PLIST_SUB+= WITH_MATRIXSSL="" @@ -36,7 +32,7 @@ PLIST_SUB+= WITH_MATRIXSSL="" PLIST_SUB+= WITH_MATRIXSSL="@comment " .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls ALL_TARGET+= build_gnutls PLIST_SUB+= WITH_GNUTLS="" @@ -44,7 +40,7 @@ PLIST_SUB+= WITH_GNUTLS="" PLIST_SUB+= WITH_GNUTLS="@comment " .endif -.if defined(WITH_XYSSL) +.if ${PORT_OPTIONS:MXYSSL} BUILD_DEPENDS= ${PREFIX}/lib/libxyssl.a:${PORTSDIR}/security/xyssl ALL_TARGET+= build_xyssl PLIST_SUB+= WITH_XYSSL="" @@ -68,22 +64,22 @@ do-install: @${INSTALL} ${WRKSRC}/openssl/libspopenssl.so ${PREFIX}/lib/libspopenssl.so.1 @${LN} -s ${PREFIX}/lib/libspopenssl.so.1 ${PREFIX}/lib/libspopenssl.so -.if defined (WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} @${INSTALL} ${WRKSRC}/gnutls/spgnutls.hpp ${PREFIX}/include/spserver @${INSTALL} ${WRKSRC}/gnutls/libspgnutls.so ${PREFIX}/lib/libspgnutls.so.1 @${LN} -s ${PREFIX}/lib/libspgnutls.so.1 ${PREFIX}/lib/libspgnutls.so .endif -.if defined (WITH_MATRIXSSL) +.if ${PORT_OPTIONS:MMATRIXSSL} @${INSTALL} ${WRKSRC}/matrixssl/spmatrixssl.hpp ${PREFIX}/include/spserver @${INSTALL} ${WRKSRC}/matrixssl/libspmatrixssl.so ${PREFIX}/lib/libspmatrixssl.so.1 @${LN} -s ${PREFIX}/lib/libspmatrixssl.so.1 ${PREFIX}/lib/libspmatrixssl.so .endif -.if defined (WITH_XYSSL) +.if ${PORT_OPTIONS:MXYSSL} @${INSTALL} ${WRKSRC}/xyssl/spxyssl.hpp ${PREFIX}/include/spserver @${INSTALL} ${WRKSRC}/xyssl/libspxyssl.so ${PREFIX}/lib/libspxyssl.so.1 @${LN} -s ${PREFIX}/lib/libspxyssl.so.1 ${PREFIX}/lib/libspxyssl.so .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/tightvnc/Makefile ============================================================================== --- head/net/tightvnc/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/tightvnc/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -32,14 +32,15 @@ NO_INSTALL_MANPAGES= yes MAN1= Xvnc.1 vncviewer.1 vncpasswd.1 vncconnect.1 vncserver.1 -OPTIONS= JVNC_VIEWER "Install Java-based vnc viewer" off +OPTIONS_DEFINE= JVNC_VIEWER +JVNC_VIEWER_DESC= Install Java-based vnc viewer #.include <bsd.port.pre.mk> ### use me when 5.5, 6.1, 6.2R die or we do impement something in b.p.m .include <bsd.port.options.mk> -.ifdef(WITH_JVNC_VIEWER) +.if ${PORT_OPTIONS:MJVNC_VIEWER} USE_JAVA= yes JAVA_RUN= yes PLIST_SUB+= JVNC_VIEWER="" @@ -73,7 +74,7 @@ do-install: @${STRIP_CMD} ${PREFIX}/bin/${FILE} .endfor .endif -.ifdef(WITH_JVNC_VIEWER) +.if ${PORT_OPTIONS:MJVNC_VIEWER} @${MKDIR} ${DATADIR}/classes ${INSTALL_DATA} ${WRKSRC}/classes/*.* ${DATADIR}/classes .endif Modified: head/net/vnc/Makefile ============================================================================== --- head/net/vnc/Makefile Tue Jun 4 04:45:22 2013 (r319823) +++ head/net/vnc/Makefile Tue Jun 4 06:34:05 2013 (r319824) @@ -1,9 +1,5 @@ -# New ports collection makefile for: vnc -# Date created: 24 February 1998 -# Whom: msmith -# +# Created by: msmith # $FreeBSD$ -# PORTNAME= vnc PORTVERSION= 4.1.3 @@ -31,7 +27,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix PLIST= ${WRKDIR}/pkg-plist CONFLICTS= tightvnc-[0-9]* tridiavnc-[0-9]* -OPTIONS= SERVER "Install VNC server components" on +OPTIONS_DEFINE= SERVER +OPTIONS_DEFINE= SERVER +SERVER_DESC= Install VNC server components MAN1= vncviewer.1 \ vncpasswd.1 \ @@ -48,7 +46,7 @@ PREFIX=${REALVNC_BASE} BROKEN= Does not compile on arm .endif -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} MASTER_SITES+= ${MASTER_SITE_XORG:S/$/:x/} MASTER_SITE_SUBDIR+= 4.3.0/:x DISTFILES+= X430src-1.tgz:x \ @@ -77,13 +75,13 @@ PLIST_SUB+= SERVER="@comment " .endif post-extract: -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @cd ${WRKSRC} && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \ ${RM} -rf ${WRKDIR}/xc .endif post-patch: -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${PREFIX}|g' \ ${WRKSRC}/xc/config/cf/vnc.def @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' -e 's|%%CXX%%|${CXX}|g' \ @@ -92,7 +90,7 @@ post-patch: .endif post-build: -.if defined(WITHOUT_SERVER) +.if ! ${PORT_OPTIONS:MSERVER} @${ECHO_MSG} "Skipping build of VNC server." .else cd ${WRKSRC}/xc && make CC=${CC} CXX=${CXX} World @@ -100,7 +98,7 @@ post-build: pre-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \ ${ECHO_CMD} lib/modules/extensions/vnc.so ; \ ${ECHO_CMD} "@dirrmtry lib/modules/extensions" ; \ @@ -114,7 +112,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${f}/${f} ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${f}/${f}.man ${PREFIX}/man/man1/${f}.1 .endfor -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @${REINPLACE_CMD} -e \ 's|/usr/local/vnc/classes|${DATADIR}/classes|g' \ ${WRKSRC}/vncserver
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306040634.r546Y5x5061443>