From c0b3ecac4483b2524287317171c79548d9842905 Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Wed, 3 Oct 2007 23:22:04 +0000 Subject: Remove support for OSVERSION < 5 --- lang/ezm3/Makefile | 4 ---- lang/icc/Makefile | 6 ++---- lang/icc7/Makefile | 6 ++---- lang/ifc/Makefile | 6 ++---- lang/ifc7/Makefile | 6 ++---- lang/p5-ExtUtils-F77/Makefile | 9 ++------- lang/p5-F77/Makefile | 9 ++------- lang/perl5.10/Makefile | 3 --- lang/perl5.12/Makefile | 3 --- lang/perl5.14/Makefile | 3 --- lang/perl5.16/Makefile | 3 --- lang/perl5.8/Makefile | 3 --- lang/php4/Makefile | 2 +- lang/python23/Makefile | 6 ++---- lang/python24/Makefile | 6 ++---- lang/python25/Makefile | 12 ++---------- lang/python26/Makefile | 12 ++---------- lang/python27/Makefile | 12 ++---------- lang/python30/Makefile | 12 ++---------- lang/python31/Makefile | 12 ++---------- lang/python32/Makefile | 12 ++---------- lang/ruby18/Makefile | 2 +- lang/yarv/Makefile | 8 +------- 23 files changed, 31 insertions(+), 126 deletions(-) diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile index d4c6788d8b6e..00f92bb6a9a2 100644 --- a/lang/ezm3/Makefile +++ b/lang/ezm3/Makefile @@ -44,10 +44,6 @@ PROGS= bin/m3build \ ONLY_FOR_ARCHS= alpha amd64 i386 sparc64 -.if ${OSVERSION} < 410000 -BROKEN= Not supported on versions earlier than 4.1-RELEASE -.endif - .if ${ARCH} == "alpha" TARGET= FBSD_ALPHA WORDSIZE= 64 diff --git a/lang/icc/Makefile b/lang/icc/Makefile index df123e737017..9e5c0dc8c93c 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -181,8 +181,7 @@ post-patch: >${WRKSRC}/opt/${COMPILERDIR}/include/stdbool.h .endif -.if ( ${OSVERSION} >= 470101 && ${OSVERSION} < 500000 ) || \ - ( ${OSVERSION} >= 500042 ) +.if ( ${OSVERSION} >= 500042 ) OBJCOPY_OPS= --redefine-sym stdin=__stdinp \ --redefine-sym stdout=__stdoutp \ --redefine-sym stderr=__stderrp @@ -200,8 +199,7 @@ do-build: .if ( ${OSVERSION} < 502101 ) @cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/cxa_atexit.c .endif -.if ( ${OSVERSION} < 470101 ) || \ - ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500042 ) +.if ( ${OSVERSION} < 500042 ) @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index 20eb41a54707..da6428d43d8f 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -125,8 +125,7 @@ post-patch: @${RM} -rf ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/include/sys .endif -.if ( ${OSVERSION} >= 470101 && ${OSVERSION} < 500000 ) || \ - ( ${OSVERSION} >= 500042 ) +.if ( ${OSVERSION} >= 500042 ) OBJCOPY_OPS= --redefine-sym stdin=__stdinp \ --redefine-sym stdout=__stdoutp \ --redefine-sym stderr=__stderrp @@ -139,8 +138,7 @@ do-build: .if ( ${OSVERSION} < 502101 ) @cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/cxa_atexit.c .endif -.if ( ${OSVERSION} < 470101 ) || \ - ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500042 ) +.if ( ${OSVERSION} < 500042 ) @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile index bee8787e9df9..d0943d69e9e7 100644 --- a/lang/ifc/Makefile +++ b/lang/ifc/Makefile @@ -121,8 +121,7 @@ post-patch: .endfor @cd ${WRKSRC}/opt/${COMPILERDIR}/bin/ && ${LN} -s ifort.cfg ifortbin.cfg -.if ( ${OSVERSION} >= 470101 && ${OSVERSION} < 500000 ) || \ - ( ${OSVERSION} >= 500042 ) +.if ( ${OSVERSION} >= 500042 ) OBJCOPY_OPS= --redefine-sym stdin=__stdinp \ --redefine-sym stdout=__stdoutp \ --redefine-sym stderr=__stderrp @@ -142,8 +141,7 @@ do-build: .if ( ${OSVERSION} < 502101 ) @cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/cxa_atexit.c .endif -.if ( ${OSVERSION} < 470101 ) || \ - ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500042 ) +.if ( ${OSVERSION} < 500042 ) @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile index 378f7597a6c8..7e110368d0b3 100644 --- a/lang/ifc7/Makefile +++ b/lang/ifc7/Makefile @@ -105,8 +105,7 @@ post-patch: .endfor @cd ${WRKSRC}/opt/intel/${COMPILERDIR}/ia32/bin/ && ${LN} -s ifc.cfg ifcbin.cfg -.if ( ${OSVERSION} >= 470101 && ${OSVERSION} < 500000 ) || \ - ( ${OSVERSION} >= 500042 ) +.if ( ${OSVERSION} >= 500042 ) OBJCOPY_OPS= --redefine-sym stdin=__stdinp \ --redefine-sym stdout=__stdoutp \ --redefine-sym stderr=__stderrp @@ -122,8 +121,7 @@ do-build: .if ( ${OSVERSION} < 502101 ) @cd ${WRKSRC} && ${CC} ${CFLAGS} -c ${FILESDIR}/cxa_atexit.c .endif -.if ( ${OSVERSION} < 470101 ) || \ - ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500042 ) +.if ( ${OSVERSION} < 500042 ) @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdin.o ${FILESDIR}/stdin.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stdout.o ${FILESDIR}/stdout.c @${CC} ${CFLAGS} -c -o ${WRKSRC}/stderr.o ${FILESDIR}/stderr.c diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile index f4c715a96876..81ed942fb2b3 100644 --- a/lang/p5-ExtUtils-F77/Makefile +++ b/lang/p5-ExtUtils-F77/Makefile @@ -19,15 +19,10 @@ PERL_CONFIGURE= yes MAN3= ExtUtils::F77.3 -.include -.if ${OSVERSION} >= 400005 -F2CLIB= -lg2c -.else -F2CLIB= -lf2c -.endif +F2CLIB= -lg2c post-patch: @cd ${WRKSRC}; ${PERL5} -i.orig -pe \ 's/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/' F77.pm -.include +.include diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile index f4c715a96876..81ed942fb2b3 100644 --- a/lang/p5-F77/Makefile +++ b/lang/p5-F77/Makefile @@ -19,15 +19,10 @@ PERL_CONFIGURE= yes MAN3= ExtUtils::F77.3 -.include -.if ${OSVERSION} >= 400005 -F2CLIB= -lg2c -.else -F2CLIB= -lf2c -.endif +F2CLIB= -lg2c post-patch: @cd ${WRKSRC}; ${PERL5} -i.orig -pe \ 's/(.*Freebsd.*lib )(-lf2c)(.*)/$$1 ${F2CLIB} $$3/' F77.pm -.include +.include diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile index 4ec9934273c7..13c8a8237609 100644 --- a/lang/perl5.10/Makefile +++ b/lang/perl5.10/Makefile @@ -97,9 +97,6 @@ CONFIGURE_ARGS+= -Dusethreads=y PKGNAMESUFFIX= -threaded # it seems perl malloc has problems with threaded perl on FreeBSD .undef WITH_PERL_MALLOC -.if ${OSVERSION} < 492000 -CONFIGURE_ARGS+= -Ud_gethostbyaddr_r -.endif .else CONFIGURE_ARGS+= -Dusethreads=n .endif diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index 4ec9934273c7..13c8a8237609 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -97,9 +97,6 @@ CONFIGURE_ARGS+= -Dusethreads=y PKGNAMESUFFIX= -threaded # it seems perl malloc has problems with threaded perl on FreeBSD .undef WITH_PERL_MALLOC -.if ${OSVERSION} < 492000 -CONFIGURE_ARGS+= -Ud_gethostbyaddr_r -.endif .else CONFIGURE_ARGS+= -Dusethreads=n .endif diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile index 4ec9934273c7..13c8a8237609 100644 --- a/lang/perl5.14/Makefile +++ b/lang/perl5.14/Makefile @@ -97,9 +97,6 @@ CONFIGURE_ARGS+= -Dusethreads=y PKGNAMESUFFIX= -threaded # it seems perl malloc has problems with threaded perl on FreeBSD .undef WITH_PERL_MALLOC -.if ${OSVERSION} < 492000 -CONFIGURE_ARGS+= -Ud_gethostbyaddr_r -.endif .else CONFIGURE_ARGS+= -Dusethreads=n .endif diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index 4ec9934273c7..13c8a8237609 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -97,9 +97,6 @@ CONFIGURE_ARGS+= -Dusethreads=y PKGNAMESUFFIX= -threaded # it seems perl malloc has problems with threaded perl on FreeBSD .undef WITH_PERL_MALLOC -.if ${OSVERSION} < 492000 -CONFIGURE_ARGS+= -Ud_gethostbyaddr_r -.endif .else CONFIGURE_ARGS+= -Dusethreads=n .endif diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile index 4ec9934273c7..13c8a8237609 100644 --- a/lang/perl5.8/Makefile +++ b/lang/perl5.8/Makefile @@ -97,9 +97,6 @@ CONFIGURE_ARGS+= -Dusethreads=y PKGNAMESUFFIX= -threaded # it seems perl malloc has problems with threaded perl on FreeBSD .undef WITH_PERL_MALLOC -.if ${OSVERSION} < 492000 -CONFIGURE_ARGS+= -Ud_gethostbyaddr_r -.endif .else CONFIGURE_ARGS+= -Dusethreads=n .endif diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 2efcb9e04412..72bacc932b40 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -150,7 +150,7 @@ CONFIGURE_ARGS+=--enable-debug CONFIGURE_ARGS+=--enable-zend-multibyte .endif -.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) +.if defined(WITHOUT_IPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif diff --git a/lang/python23/Makefile b/lang/python23/Makefile index fa4fe11865bb..0e1b85ad46d9 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -93,7 +93,7 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -103,10 +103,8 @@ CONFIGURE_ARGS+= --disable-ipv6 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif post-extract: diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 0b6d353a4355..9ed19daf1b8d 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -103,7 +103,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -117,10 +117,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif post-extract: diff --git a/lang/python25/Makefile b/lang/python25/Makefile index a688a3c2f0b1..970afaecc195 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -106,13 +106,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if ${OSVERSION} < 400000 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" -.endif - -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -126,10 +120,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif pre-patch: diff --git a/lang/python26/Makefile b/lang/python26/Makefile index a688a3c2f0b1..970afaecc195 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -106,13 +106,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if ${OSVERSION} < 400000 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" -.endif - -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -126,10 +120,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif pre-patch: diff --git a/lang/python27/Makefile b/lang/python27/Makefile index a688a3c2f0b1..970afaecc195 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -106,13 +106,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if ${OSVERSION} < 400000 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" -.endif - -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -126,10 +120,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif pre-patch: diff --git a/lang/python30/Makefile b/lang/python30/Makefile index a688a3c2f0b1..970afaecc195 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -106,13 +106,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if ${OSVERSION} < 400000 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" -.endif - -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -126,10 +120,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif pre-patch: diff --git a/lang/python31/Makefile b/lang/python31/Makefile index a688a3c2f0b1..970afaecc195 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -106,13 +106,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if ${OSVERSION} < 400000 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" -.endif - -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -126,10 +120,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif pre-patch: diff --git a/lang/python32/Makefile b/lang/python32/Makefile index a688a3c2f0b1..970afaecc195 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -106,13 +106,7 @@ PLIST_SUB+= NO_NIS="@comment " PLIST_SUB+= NO_NIS="" .endif -.if ${OSVERSION} < 400000 -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" -.endif - -.if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 @@ -126,10 +120,8 @@ CONFIGURE_ARGS+= --with-fpectl PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6 .elif ${OSVERSION} >= 600000 PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd7 -.elif ${OSVERSION} >= 500000 -PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .else -PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7 +PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7 .endif pre-patch: diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index 730178842d76..1d14a8c5ca17 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -92,7 +92,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-eval.c EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-gc .endif -.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6) +.if !defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif diff --git a/lang/yarv/Makefile b/lang/yarv/Makefile index d60ef4f8395f..b3b9da62af33 100644 --- a/lang/yarv/Makefile +++ b/lang/yarv/Makefile @@ -22,6 +22,7 @@ USE_RUBY= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} --program-suffix=20 \ --enable-shared --with-openssl-include=${OPENSSLINC} +CONFIGURE_ARGS+=--enable-ipv6 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" OPTIONS= DEBUG "Enable debugging information" off \ @@ -37,13 +38,6 @@ BROKEN= does not build BROKEN= Does not build on 5.x .endif -.if ${OSVERSION} >= 400014 -CONFIGURE_ARGS+=--enable-ipv6 -.if ${OSVERSION} < 500000 -CONFIGURE_ARGS+=--enable-wide-getaddrinfo -.endif -.endif - .if defined(NOPORTDOCS) INSTALL_TARGET= install-nodoc PLIST_SUB+= PORTSDOCS="@comment " -- cgit v1.2.3