diff options
-rw-r--r-- | databases/vfront/Makefile | 8 | ||||
-rw-r--r-- | net/openradius/Makefile | 8 | ||||
-rw-r--r-- | net/opentracker/Makefile | 43 | ||||
-rw-r--r-- | net/ssltunnel-server/Makefile | 5 | ||||
-rw-r--r-- | www/mnogosearch/Makefile | 51 |
5 files changed, 62 insertions, 53 deletions
diff --git a/databases/vfront/Makefile b/databases/vfront/Makefile index 609f22c23e9e..b35583e81c6d 100644 --- a/databases/vfront/Makefile +++ b/databases/vfront/Makefile @@ -20,17 +20,17 @@ PLIST= ${WRKDIR}/pkg-plist USE_PHP= yes -OPTIONS+= MYSQL "Use MySQL databases" off -OPTIONS+= PGSQL "Use PostgreSQL databases" off +OPTIONS_MULTI= database +OPTIONS_MULTI_database= MYSQL PGSQL .include <bsd.port.options.mk> -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_PHP+= mysqli USE_MYSQL= yes .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql USE_PGSQL= yes .endif diff --git a/net/openradius/Makefile b/net/openradius/Makefile index ebcdbb05a015..e7c163a6ad5f 100644 --- a/net/openradius/Makefile +++ b/net/openradius/Makefile @@ -26,11 +26,11 @@ USE_GMAKE= yes USE_RC_SUBR= openradius SUB_LIST= LOGFILE="${LOGFILE}" -OPTIONS= LDAP "With LDAP user database" off +OPTIONS_DEFINE= LDAP -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= YES PLIST_SUB+= LDAP="" SCRIPTS_ENV+= USE_LDAP=yes @@ -93,4 +93,4 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile index 7f5046fcb3cf..39516f366e79 100644 --- a/net/opentracker/Makefile +++ b/net/opentracker/Makefile @@ -20,42 +20,53 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/devel/libowfat USE_BZIP2= yes USE_RC_SUBR= ${PORTNAME} -OPTIONS= WANT_ACCESSLIST_BLACK "Enable client blacklisting" Off \ - WANT_ACCESSLIST_WHITE "Enable client whitelisting" Off \ - WANT_COMPRESSION_GZIP "Deliver gzip compressed full scrapes" Off \ - DEBUG_HTTPERROR "Verbose HTTPERRORs" Off \ - WANT_FULLSCRAPE "Can query tracker for all torrents" On \ - WANT_V6 "IPv6-only" Off \ - WANT_RESTRICT_STATS "Limit stats access based on IP" On +OPTIONS_DEFINE= COMPRESSION_GZIP DEBUG_HTTPERROR FULLSCRAPE RESTRICT_STATS IPV6 +OPTIONS_SINGLE= accesslist +OPTIONS_SINGLE_accesslist= ACCESSLIST_OPEN ACCESSLIST_BLACK \ + ACCESSLIST_WHITE + +OPTIONS_DEFAULT= FULLSCRAPE RESTRICT_STATS ACCESSLIST_OPEN + +ACCESSLIST_OPEN_DESC= Disable black/whitelisting +ACCESSLIST_BLACK_DESC= Enable client blacklisting +ACCESSLIST_WHITE_DESC= Enable client whitelisting +COMPRESSION_GZIP_DESC= Deliver gzip compressed full scrapes +DEBUG_HTTPERROR_DESC= Verbose HTTPERRORs +FULLSCRAPE_DESC= Can query tracker for all torrents +RESTRICT_STATS_DESC= Limit stats access based on IP .include <bsd.port.options.mk> -.if defined(WITH_WANT_ACCESSLIST_BLACK) +.if ${PORT_OPTIONS:MACCESSLIST_BLACK} FEATURES+=-DWANT_ACCESSLIST_BLACK -.endif -.if defined(WITH_WANT_ACCESSLIST_WHITE) +.elif ${PORT_OPTIONS:MACCESSLIST_WHITE} FEATURES+=-DWANT_ACCESSLIST_WHITE .endif -.if defined(WITH_WANT_COMPRESSION_GZIP) + +.if ${PORT_OPTIONS:MCOMPRESSION_GZIP} FEATURES+=-DWANT_COMPRESSION_GZIP .endif -.if defined(WITH_DEBUG_HTTPERROR) + +.if ${PORT_OPTIONS:MDEBUG_HTTPERROR} FEATURES+=-D_DEBUG_HTTPERROR .endif -.if defined(WITH_WANT_FULLSCRAPE) + +.if ${PORT_OPTIONS:MFULLSCRAPE} FEATURES+=-DWANT_FULLSCRAPE .endif -.if defined(WITH_WANT_V6) + +.if ${PORT_OPTIONS:MIPV6} FEATURES+=-DWANT_V6 .endif -.if defined(WITH_WANT_RESTRICT_STATS) + +.if ${PORT_OPTIONS:MRESTRICT_STATS} FEATURES+=-DWANT_RESTRICT_STATS .endif MAKE_ENV+=FEATURES="${FEATURES}" post-patch: - @${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \; + @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile index cba5e237516c..bc7c272ac6f1 100644 --- a/net/ssltunnel-server/Makefile +++ b/net/ssltunnel-server/Makefile @@ -17,14 +17,15 @@ COMMENT= PPP over SSL virtual private networking (server part) LICENSE= BSD -OPTIONS= TCPWRAPPERS "libwrap support" off +OPTIONS_DEFINE= TCPWRAPPERS +TCPWRAPPERS_DESC= libwrap support GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-client .include <bsd.port.options.mk> -.if defined(WITH_TCPWRAPPERS) +.if ${PORT_OPTIONS:MTCPWRAPPERS} CONFIGURE_ARGS+=--with-libwrap .endif diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index ad1ecc1c3721..056d608464ed 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -17,15 +17,17 @@ COMMENT= Full featured SQL-based hypertext search engine MAN1= indexer.1 MAN5= indexer.conf.5 -OPTIONS= THREADS "Enable pthreads" on \ - SSL "Enable SSL" on \ - ASIAN "Enable asian charsets" off \ - SYSLOG "Send logs to syslog" on \ - PGSQL "Use PGSQL" off \ - MSQL "Use MSQL" off \ - MYSQL "Use MySQL" off \ - SQLITE "Use SQLite 2.x" off \ - SQLITE3 "Use SQLite 3.x" on +OPTIONS_DEFINE= THREADS SSL ASIAN SYSLOG + +OPTIONS_MULTI= database +OPTIONS_MULTI_database= PGSQL MSQL MYSQL SQLITE2 SQLITE3 + +OPTIONS_DEFAULT= THREADS SSL SYSLOG SQLITE3 + +ASIAN_DESC= Enable asian charsets +SYSLOG_DESC= Send logs to syslog +SQLITE2_DESC= Use SQLite 2.x +SQLITE3_DESC= Use SQLite 3.x USE_LDCONFIG= yes USE_GNOME= lthack @@ -45,61 +47,56 @@ SUB_FILES+= pkg-message .include <bsd.port.options.mk> -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes .endif -.ifdef WITHOUT_THREADS -CONFIGURE_ARGS+= --disable-pthreads -CFLAGS+= -DCONSOLE -.else +.if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-pthreads CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" +.else +CONFIGURE_ARGS+= --disable-pthreads +CFLAGS+= -DCONSOLE .endif -.if !defined(WITHOUT_SSL) +.if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif -.ifdef WITH_ASIAN +.if ${PORT_OPTIONS:MASIAN} CONFIGURE_ARGS+= --with-extra-charsets=all .endif -.ifdef WITHOUT_SYSLOG +.if empty(PORT_OPTIONS:MSYSLOG) CONFIGURE_ARGS+= --disable-syslog .endif -.ifdef WITH_PGSQL +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} .endif -.ifdef WITH_MSQL +.if ${PORT_OPTIONS:MMSQL} LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql CONFIGURE_ARGS+= --with-msql=${LOCALBASE} .endif -.ifdef WITH_MYSQL +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif -.ifdef WITH_SQLITE +.if ${PORT_OPTIONS:MSQLITE2} USE_SQLITE= 2 CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} .endif -.ifndef WITHOUT_SQLITE3 +.if ${PORT_OPTIONS:MSQLITE3} USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} .endif -.if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && \ - !defined(WITH_MSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE3) -IGNORE= needs at least one database driver -.endif - DOCS= ChangeLog INSTALL PORTDOCS= * PORTEXAMPLES= README *.conf |