aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/ruby/Makefile11
-rw-r--r--lang/ruby14/Makefile11
-rw-r--r--lang/ruby16/Makefile11
-rw-r--r--net/mtr/Makefile19
4 files changed, 31 insertions, 21 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 21b224037935..6b555d0e88ca 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -19,9 +19,6 @@ MAINTAINER= yasuf@big.or.jp
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
-.if defined(USE_INET6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
MAN1= ruby.1
PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -33,6 +30,12 @@ BRANCH_NAME= 1.4
DOCDIR= ${PREFIX}/share/doc/ruby
EXAMPLESDIR= ${PREFIX}/share/examples/ruby
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400014
+CONFIGURE_ARGS+= --enable-ipv6
+.endif
+
post-patch:
${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
${RM} -f ${WRKSRC}/ext/tk/MANIFEST
@@ -66,4 +69,4 @@ post-install:
test:
@(cd ${WRKSRC}; make test)
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index 21b224037935..6b555d0e88ca 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -19,9 +19,6 @@ MAINTAINER= yasuf@big.or.jp
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
-.if defined(USE_INET6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
MAN1= ruby.1
PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -33,6 +30,12 @@ BRANCH_NAME= 1.4
DOCDIR= ${PREFIX}/share/doc/ruby
EXAMPLESDIR= ${PREFIX}/share/examples/ruby
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400014
+CONFIGURE_ARGS+= --enable-ipv6
+.endif
+
post-patch:
${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
${RM} -f ${WRKSRC}/ext/tk/MANIFEST
@@ -66,4 +69,4 @@ post-install:
test:
@(cd ${WRKSRC}; make test)
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 21b224037935..6b555d0e88ca 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -19,9 +19,6 @@ MAINTAINER= yasuf@big.or.jp
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
-.if defined(USE_INET6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
MAN1= ruby.1
PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -33,6 +30,12 @@ BRANCH_NAME= 1.4
DOCDIR= ${PREFIX}/share/doc/ruby
EXAMPLESDIR= ${PREFIX}/share/examples/ruby
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400014
+CONFIGURE_ARGS+= --enable-ipv6
+.endif
+
post-patch:
${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
${RM} -f ${WRKSRC}/ext/tk/MANIFEST
@@ -66,4 +69,4 @@ post-install:
test:
@(cd ${WRKSRC}; make test)
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 94b47dc5df82..98fada6290ab 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -11,23 +11,24 @@ CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
http://www.giovannelli.it/~gmarco/files/
-.if defined(USE_INET6)
+MAINTAINER= billf@FreeBSD.org
+
+HAS_CONFIGURE= yes
+
+MAN8= mtr.8
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400014
PATCHFILES= mtr-041-v6-20000113.diff.gz
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
PATCH_DIST_STRIP= -p1
-.endif
-
-MAINTAINER= billf@FreeBSD.org
-HAS_CONFIGURE= yes
-.if defined(USE_INET6)
CONFIGURE_ARGS+=--enable-ipv6
.else
CONFIGURE_ARGS+=--disable-ipv6
.endif
-MAN8= mtr.8
-
pre-patch:
.if !defined(USE_GTK)
@${ECHO} ""
@@ -53,4 +54,4 @@ post-install:
@${ECHO} "in file ${WRKSRC}/SECURITY (not installed)"
@${ECHO} ""
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>