From dbc8aa6cc1cb1abadce30cfe133c7a5c2ed2f34b Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Wed, 11 Nov 1998 05:37:39 +0000 Subject: Use bsd.port.{pre,post}.mk. Either use them to avoid having to define something already there (PORTOBJFORMAT, OSVERSION) or move stuff from after .include to before. (This is not by any means the complete list but just the ones I've noticed recently.) --- lang/bc-gcc/Makefile | 7 ++++--- lang/gcc28/Makefile | 13 +++++++------ lang/glibstdc++28/Makefile | 9 +++++---- lang/perl5.10/Makefile | 9 +++++---- lang/perl5.12/Makefile | 9 +++++---- lang/perl5.14/Makefile | 9 +++++---- lang/perl5.16/Makefile | 9 +++++---- lang/perl5.6/Makefile | 9 +++++---- lang/perl5.8/Makefile | 9 +++++---- lang/perl5/Makefile | 9 +++++---- lang/python+ipv6/Makefile | 17 ++++++++--------- lang/python-devel/Makefile | 17 ++++++++--------- lang/python/Makefile | 17 ++++++++--------- lang/python15/Makefile | 17 ++++++++--------- lang/python20/Makefile | 17 ++++++++--------- lang/python21/Makefile | 17 ++++++++--------- lang/python22/Makefile | 17 ++++++++--------- lang/python23/Makefile | 17 ++++++++--------- lang/python24/Makefile | 17 ++++++++--------- lang/python25/Makefile | 17 ++++++++--------- lang/python26/Makefile | 17 ++++++++--------- lang/python27/Makefile | 17 ++++++++--------- lang/python30/Makefile | 17 ++++++++--------- lang/python31/Makefile | 17 ++++++++--------- lang/python32/Makefile | 17 ++++++++--------- 25 files changed, 171 insertions(+), 176 deletions(-) (limited to 'lang') diff --git a/lang/bc-gcc/Makefile b/lang/bc-gcc/Makefile index 87c65b48158e..0f93507ba365 100644 --- a/lang/bc-gcc/Makefile +++ b/lang/bc-gcc/Makefile @@ -4,7 +4,7 @@ # Date created: Sun June 08, 1997 # Whom: David O'Brien (obrien@FreeBSD.org) # -# $Id: Makefile,v 1.3 1997/06/08 12:58:59 andreas Exp $ +# $Id: Makefile,v 1.1.1.1 1998/08/26 09:41:56 obrien Exp $ # DISTNAME= gcc-2.7.2 @@ -24,7 +24,8 @@ PATCH_DIST_STRIP= -p1 -N -E MAINTAINER= obrien@FreeBSD.org -OSVERSION!= sysctl -n kern.osreldate +.include + .if ${OSVERSION} >= 300000 BROKEN= "can't find /usr/lib/aout/crt0.o" .endif @@ -58,4 +59,4 @@ post-install: do strip $$prog ; \ done ) -.include +.include diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile index 13d635bb6784..b75eae1d973c 100644 --- a/lang/gcc28/Makefile +++ b/lang/gcc28/Makefile @@ -4,7 +4,7 @@ # Date created: 17 Jan 1998 # Whom: David O'Brien # -# $Id: Makefile,v 1.16 1998/10/08 01:19:19 asami Exp $ +# $Id: Makefile,v 1.17 1998/11/10 07:33:33 obrien Exp $ # DISTNAME= gcc-2.8.1 @@ -13,8 +13,9 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= obrien@FreeBSD.org -ARE_WE_ELF!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout -.if ${ARE_WE_ELF} == "elf" +.include + +.if ${PORTOBJFORMAT} == "elf" GNUHOST= i386-unknown-freebsdelf${OSREL} .else GNUHOST= i386-unknown-freebsd${OSREL} @@ -22,7 +23,7 @@ GNUHOST= i386-unknown-freebsd${OSREL} PLIST_SUB= GNUHOST=${GNUHOST} CONFIGURE_ARGS= --with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/include/g++ -.if ${ARE_WE_ELF} == "elf" +.if ${PORTOBJFORMAT} == "elf" CONFIGURE_ARGS+= --host=${GNUHOST} .endif GNU_CONFIGURE= yes @@ -31,7 +32,7 @@ ALL_TARGET= bootstrap MAN1= cccp28.1 g++28.1 gcc28.1 pre-fetch: - @${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${ARE_WE_ELF}" + @${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}" pre-configure: @(cd ${WRKSRC}/config/i386/ ; \ @@ -60,4 +61,4 @@ post-install: @${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1 @${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1 -.include +.include diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile index 684ab0f0ee09..44f36d31a778 100644 --- a/lang/glibstdc++28/Makefile +++ b/lang/glibstdc++28/Makefile @@ -4,7 +4,7 @@ # Date created: 03 Mar 1998 # Whom: David O'Brien # -# $Id: Makefile,v 1.11 1998/10/12 15:04:35 jseger Exp $ +# $Id: Makefile,v 1.12 1998/11/10 16:33:07 obrien Exp $ # DISTNAME= libstdc++-2.8.1.1 @@ -19,10 +19,11 @@ BUILD_DEPENDS= gcc28:${PORTSDIR}/lang/gcc28 \ RUN_DEPENDS= gcc28:${PORTSDIR}/lang/gcc28 \ g++28:${PORTSDIR}/lang/gcc28 +.include + CC= gcc28 CXX= g++28 -ARE_WE_ELF!= text -x /usr/bin/objformat && /usr/bin/objformat || echo aout -.if ${ARE_WE_ELF} == "elf" +.if ${PORTOBJFORMAT} == "elf" GNUHOST= i386-unknown-freebsdelf${OSREL} .else GNUHOST= i386-unknown-freebsd${OSREL} @@ -49,4 +50,4 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/osfcn.h \ ${PREFIX}/${GCC28DIR}/include/g++ -.include +.include diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5.10/Makefile +++ b/lang/perl5.10/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5.14/Makefile +++ b/lang/perl5.14/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5.6/Makefile +++ b/lang/perl5.6/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5.8/Makefile +++ b/lang/perl5.8/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index ff11ae222c62..8ecf159155dc 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -3,7 +3,7 @@ # Date created: 16 April 1995 # Whom: markm # -# $Id: Makefile,v 1.25 1998/08/15 16:33:13 markm Exp $ +# $Id: Makefile,v 1.26 1998/10/12 06:51:07 markm Exp $ # DISTNAME= perl5.005_02 @@ -18,8 +18,9 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} -OSVER!= sysctl -n kern.osreldate -.if ${OSVER} > 300003 +.include + +.if ${OSVERSION} > 300003 BROKEN= perl is in system .endif @@ -87,4 +88,4 @@ post-install: @ln -sf ${PREFIX}/bin/perl ${PREFIX}/bin/perl5 @(cd /usr/include && ${PREFIX}/bin/h2ph *.h machine/*.h sys/*.h) -.include +.include diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python/Makefile b/lang/python/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 491a1aa8f7a5..80e254d58a69 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -3,7 +3,7 @@ # Date created: 08 August 1995 # Whom: jkh # -# $Id: Makefile,v 1.39 1998/09/25 10:05:08 asami Exp $ +# $Id: Makefile,v 1.40 1998/10/06 06:49:12 tg Exp $ # DISTNAME= pyth151 @@ -82,7 +82,12 @@ post-configure: ${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local .endfor -OSVERSION!= sysctl -n kern.osreldate +.include + +.if ${PORTOBJFORMAT} == elf +LDFLAGS+= -rdynamic +CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" +.endif pre-install: .if ${OSVERSION} < 300000 @@ -97,10 +102,4 @@ post-install: ${INSTALL_SCRIPT} ${PREFIX}/lib/python1.5/plat-freebsd2/regen ${PREFIX}/lib/python1.5/plat-freebsd3 strip ${PREFIX}/bin/python -.include - -# need to get ${PORTOBJFORMAT} -.if ${PORTOBJFORMAT} == elf -LDFLAGS+= -rdynamic -CONFIGURE_ENV?= LDFLAGS="${LDFLAGS}" -.endif +.include -- cgit v1.2.3