aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjgh <jgh@FreeBSD.org>2013-04-09 05:26:54 +0800
committerjgh <jgh@FreeBSD.org>2013-04-09 05:26:54 +0800
commitc95c7418943f80aa97f26eebce2f654c029176de (patch)
tree868cb4182c6ca1f516d36fc8e2a0a6ad51a055a3 /net
parent9d658492b69d6f648f256d0e4e29b94625387a6a (diff)
downloadfreebsd-ports-gnome-c95c7418943f80aa97f26eebce2f654c029176de.tar.gz
freebsd-ports-gnome-c95c7418943f80aa97f26eebce2f654c029176de.tar.zst
freebsd-ports-gnome-c95c7418943f80aa97f26eebce2f654c029176de.zip
- complete optionsNG conversion
- trim historical headers - reformat space w/ tab where libevent was recently introduced Approved by: portmgr (bapt) Approved by: maintainer, cy@
Diffstat (limited to 'net')
-rw-r--r--net/ntp-devel/Makefile28
-rw-r--r--net/ntp-rc/Makefile24
-rw-r--r--net/ntp/Makefile24
3 files changed, 32 insertions, 44 deletions
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index dd5b2ab31c8e..9a9669bb51b3 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ntp
-# Date created: Di 5 Mai 1998 21:31:03 CEST
-# Whom: andreas
-#
+# Created by: andreas
# $FreeBSD$
-#
PORTNAME= ntp
PORTVERSION= 4.2.7p364
@@ -23,7 +19,7 @@ LATEST_LINK= ${PORTNAME}-dev
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake libtool
USES= pathfix
-LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2
MAN5= ntp.conf.5 ntp.keys.5
MAN8= ntp-keygen.8 ntpd.8 ntpdc.8 ntpq.8 sntp.8 ntp-wait.8
@@ -32,25 +28,25 @@ MAN8= ntp-keygen.8 ntpd.8 ntpdc.8 ntpq.8 sntp.8 ntp-wait.8
.include <bsd.port.options.mk>
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+= --without-crypto
-PLIST_SUB+= SSL="@comment "
-.else
+.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl-incdir=${OPENSSLINC} \
--with-openssl-libdir=${OPENSSLLIB}
PLIST_SUB+= SSL=""
+.else
+CONFIGURE_ARGS+= --without-crypto
+PLIST_SUB+= SSL="@comment "
.endif
-.if !defined(DISABLE_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --enable-ipv6
.endif
-.if defined(WITH_NTP_SIGND)
+.if ${PORT_OPTIONS:MNTP_SIGND}
CONFIGURE_ARGS+= --enable-ntp-signd
.endif
-.if defined(WITH_NTPSNMPD)
+.if ${PORT_OPTIONS:MNTPSNMPD}
PLIST_FILES+= sbin/ntpsnmpd
MAN8+= ntpsnmpd.8
BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
@@ -61,12 +57,12 @@ CONFIGURE_ARGS+= --without-ntpsnmpd
.endif
.for D in ${NTP_DRIVERS}
-.if defined(WITH_${D})
+.if ${PORT_OPTIONS:M${D}}
CONFIGURE_ARGS+= --enable-${D}
.endif
.endfor
-.if defined(WITH_MX4200)
+.if ${PORT_OPTIONS:MMX4200}
BROKEN= Fails to compile when MX4200 is enabled.
.endif
@@ -88,7 +84,7 @@ post-patch:
post-install:
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
@cd ${WRKSRC}/html && ${FIND} . -print | \
diff --git a/net/ntp-rc/Makefile b/net/ntp-rc/Makefile
index e6f5f624adbf..637f8143b901 100644
--- a/net/ntp-rc/Makefile
+++ b/net/ntp-rc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ntp
-# Date created: Di 5 Mai 1998 21:31:03 CEST
-# Whom: andreas
-#
+# Created by: andreas
# $FreeBSD$
-#
PORTNAME= ntp
PORTVERSION?= 4.2.6p5.r1
@@ -35,7 +31,7 @@ MAN1= sntp.1 \
.include <bsd.port.options.mk>
-.if defined(WITH_NTPSNMPD)
+.if ${PORT_OPTIONS:MNTPSNMPD}
PLIST_FILES+= bin/ntpsnmpd
BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
@@ -43,26 +39,26 @@ RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-m
CONFIGURE_ARGS+= --without-ntpsnmpd
.endif
-.if !defined(WITH_SSL)
-CONFIGURE_ARGS+= --without-crypto
-PLIST_SUB+= SSL="@comment "
-.else
+.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl-incdir=${OPENSSLINC} \
--with-openssl-libdir=${OPENSSLLIB}
PLIST_SUB+= SSL=""
+.else
+CONFIGURE_ARGS+= --without-crypto
+PLIST_SUB+= SSL="@comment "
.endif
-.if !defined(DISABLE_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --enable-ipv6
.endif
-.if defined(WITH_NTP_SIGND)
+.if ${PORT_OPTIONS:MNTP_SIGND}
CONFIGURE_ARGS+= --enable-ntp-signd
.endif
.for D in ${NTP_DRIVERS}
-.if defined(WITH_${D})
+.if ${PORT_OPTIONS:M${D}}
CONFIGURE_ARGS+= --enable-${D}
.endif
.endfor
@@ -70,7 +66,7 @@ CONFIGURE_ARGS+= --enable-${D}
post-install:
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
@cd ${WRKSRC}/html && ${FIND} . -print | \
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 272781f18578..d3523293090d 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ntp
-# Date created: Di 5 Mai 1998 21:31:03 CEST
-# Whom: andreas
-#
+# Created by: andreas
# $FreeBSD$
-#
PORTNAME= ntp
PORTVERSION?= 4.2.6p5
@@ -34,7 +30,7 @@ MAN1= sntp.1 \
.include <bsd.port.options.mk>
-.if defined(WITH_NTPSNMPD)
+.if ${PORT_OPTIONS:MNTPSNMPD}
PLIST_FILES+= bin/ntpsnmpd
BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
@@ -42,26 +38,26 @@ RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-m
CONFIGURE_ARGS+= --without-ntpsnmpd
.endif
-.if !defined(WITH_SSL)
-CONFIGURE_ARGS+= --without-crypto
-PLIST_SUB+= SSL="@comment "
-.else
+.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl-incdir=${OPENSSLINC} \
--with-openssl-libdir=${OPENSSLLIB}
PLIST_SUB+= SSL=""
+.else
+CONFIGURE_ARGS+= --without-crypto
+PLIST_SUB+= SSL="@comment "
.endif
-.if !defined(DISABLE_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --enable-ipv6
.endif
-.if defined(WITH_NTP_SIGND)
+.if ${PORT_OPTIONS:MNTP_SIGND}
CONFIGURE_ARGS+= --enable-ntp-signd
.endif
.for D in ${NTP_DRIVERS}
-.if defined(WITH_${D})
+.if ${PORT_OPTIONS:M${D}}
CONFIGURE_ARGS+= --enable-${D}
.endif
.endfor
@@ -75,7 +71,7 @@ post-patch:
post-install:
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
@cd ${WRKSRC}/html && ${FIND} . -print | \