From c3d8037aeba75366ed06e02fbc981e15b46e7d0a Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Tue, 12 Apr 2005 03:26:56 +0000 Subject: At Kris's request, back out the MACHINE_ARCH spelling correction until after 5.4-RELEASE. --- devel/ac-archive/Makefile | 2 +- devel/aegis/Makefile | 2 +- devel/argp-standalone/Makefile | 2 +- devel/argtable/Makefile | 2 +- devel/autoconf213/Makefile | 2 +- devel/autoconf253/Makefile | 2 +- devel/autoconf259/Makefile | 2 +- devel/autoconf26/Makefile | 2 +- devel/autoconf261/Makefile | 2 +- devel/autoconf262/Makefile | 2 +- devel/autoconf267/Makefile | 2 +- devel/autoconf268/Makefile | 2 +- devel/automake110/Makefile | 2 +- devel/automake15/Makefile | 2 +- devel/automake19/Makefile | 2 +- devel/avr-binutils/Makefile | 4 ++-- devel/avr-gcc-3/Makefile | 2 +- devel/avr-gcc/Makefile | 2 +- devel/bison-devel/Makefile | 2 +- devel/bison/Makefile | 2 +- devel/bison175/Makefile | 2 +- devel/bison1875/Makefile | 2 +- devel/bison2/Makefile | 2 +- devel/bison20/Makefile | 2 +- devel/bonobo/Makefile | 2 +- devel/c_c++_reference/Makefile | 2 +- devel/ccache/Makefile | 2 +- devel/cdialog/Makefile | 2 +- devel/cook/Makefile | 2 +- devel/cproto/Makefile | 2 +- devel/cstringbuffer/Makefile | 2 +- devel/cvsd/Makefile | 2 +- devel/cvsnt/Makefile | 2 +- devel/cxref/Makefile | 2 +- devel/ddd/Makefile | 2 +- devel/dmalloc/Makefile | 2 +- devel/doxygen/Makefile | 2 +- devel/fam/Makefile | 2 +- devel/gaul/Makefile | 2 +- devel/gengetopt/Makefile | 2 +- devel/gindent/Makefile | 10 ++++++++++ devel/global/Makefile | 2 +- devel/gnu-autoconf/Makefile | 2 +- devel/gnu-automake/Makefile | 2 +- devel/gnu-libtool/Makefile | 2 +- devel/gnustep/Makefile | 4 ++-- devel/gputils/Makefile | 2 +- devel/gsoap/Makefile | 2 +- devel/gtgt/Makefile | 2 +- devel/i386-rtems-g77/Makefile | 2 +- devel/i386-rtems-gcc/Makefile | 2 +- devel/i386-rtems-objc/Makefile | 2 +- devel/jam/Makefile | 2 +- devel/jrtplib/Makefile | 2 +- devel/kaptain/Makefile | 2 +- devel/kimwitu++/Makefile | 2 +- devel/libbfd/Makefile | 2 +- devel/libchipcard-kde/Makefile | 2 +- devel/libchipcard/Makefile | 2 +- devel/libfs++/Makefile | 2 +- devel/libghthash/Makefile | 2 +- devel/libglade/Makefile | 2 +- devel/libgutenfetch/Makefile | 2 +- devel/libmimedir/Makefile | 2 +- devel/libole2/Makefile | 2 +- devel/libpreps-devel/Makefile | 2 +- devel/libpreps/Makefile | 2 +- devel/libtar/Makefile | 2 +- devel/libtool13/Makefile | 2 +- devel/libtool15/Makefile | 2 +- devel/libzt/Makefile | 2 +- devel/lightning/Makefile | 2 +- devel/linux-allegro/Makefile | 2 +- devel/linux-f10-allegro/Makefile | 2 +- devel/linux-f10-libglade/Makefile | 2 +- devel/linux-f10-libglade2/Makefile | 2 +- devel/linux-f10-sdl12/Makefile | 6 +++--- devel/linux-f8-allegro/Makefile | 2 +- devel/linux-f8-libglade/Makefile | 2 +- devel/linux-f8-libglade2/Makefile | 2 +- devel/linux-f8-sdl12/Makefile | 6 +++--- devel/linux-libglade/Makefile | 2 +- devel/linux-libglade2/Makefile | 2 +- devel/linux-sdl12/Makefile | 6 +++--- devel/linux_devtools-6/Makefile | 18 +++++++++--------- devel/linux_devtools-7/Makefile | 14 +++++++------- devel/log4c/Makefile | 2 +- devel/log4cplus/Makefile | 2 +- devel/log4cpp/Makefile | 2 +- devel/log4cxx/Makefile | 2 +- devel/lwp/Makefile | 2 +- devel/m17n-db/Makefile | 2 +- devel/mico/Makefile | 2 +- devel/mm/Makefile | 2 +- devel/monotone/Makefile | 2 +- devel/nasm/Makefile | 2 +- devel/oaf/Makefile | 2 +- devel/omniNotify/Makefile | 2 +- devel/omniORB/Makefile | 2 +- devel/p4v/Makefile | 4 ++-- devel/pcre++/Makefile | 2 +- devel/pcre/Makefile | 2 +- devel/php-xdebug/Makefile | 2 +- devel/phptags/Makefile | 2 +- devel/popt/Makefile | 2 +- devel/poslib/Makefile | 2 +- devel/preps-gui/Makefile | 2 +- devel/prepstools/Makefile | 2 +- devel/privman/Makefile | 2 +- devel/pth/Makefile | 2 +- devel/py-omniorb/Makefile | 2 +- devel/ragel/Makefile | 2 +- devel/rlwrap/Makefile | 2 +- devel/ruby-gnustep/Makefile | 4 ++-- devel/rudiments/Makefile | 2 +- devel/sdl12/Makefile | 2 +- devel/shmap/Makefile | 2 +- devel/silc-toolkit/Makefile | 2 +- devel/splint/Makefile | 3 +-- devel/subversion-devel/Makefile | 2 +- devel/subversion-freebsd/Makefile | 2 +- devel/subversion/Makefile | 2 +- devel/subversion16/Makefile | 2 +- devel/valgrind-snapshot/Makefile | 2 +- devel/valgrind/Makefile | 2 +- devel/zziplib/Makefile | 2 +- 126 files changed, 159 insertions(+), 150 deletions(-) (limited to 'devel') diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile index 10f98d9bd7a7..82443e017f0a 100644 --- a/devel/ac-archive/Makefile +++ b/devel/ac-archive/Makefile @@ -19,7 +19,7 @@ USE_PERL5= yes USE_GMAKE= yes USE_AUTOCONF_VER= 259 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/acinclude MAN1= acinclude.1 diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile index 833938ba06d1..77af221b4242 100644 --- a/devel/aegis/Makefile +++ b/devel/aegis/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-nlsdir=${LOCALBASE}/share/locale -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= ae-sccs-put.1 ae_c.1 ae_p.1 aeannotate.1 aeb.1 aebuffy.1 \ aeca.1 aecd.1 aechown.1 aeclean.1 aeclone.1 aecomp.1 \ diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile index ef506860aeb4..e1065be64c35 100644 --- a/devel/argp-standalone/Makefile +++ b/devel/argp-standalone/Makefile @@ -14,7 +14,7 @@ MAINTAINER= sem@FreeBSD.org COMMENT= Standalone version of arguments parsing functions from GLIBC GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_FILES= lib/libargp.a include/argp.h diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile index 02e0e1e3a9f8..b8d02a5a2595 100644 --- a/devel/argtable/Makefile +++ b/devel/argtable/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}2 USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN3= argtable2.3 diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile index 72131479c6e0..0f1df88a3475 100644 --- a/devel/autoconf213/Makefile +++ b/devel/autoconf213/Makefile @@ -29,7 +29,7 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/autoconf INFO= autoconf${BUILD_VERSION} diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile index 3656e96b7c23..14f3c4b72605 100644 --- a/devel/autoconf253/Makefile +++ b/devel/autoconf253/Makefile @@ -33,7 +33,7 @@ INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile index 824ee0a20c48..b1e126bc3271 100644 --- a/devel/autoconf259/Makefile +++ b/devel/autoconf259/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile index 824ee0a20c48..b1e126bc3271 100644 --- a/devel/autoconf26/Makefile +++ b/devel/autoconf26/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile index 824ee0a20c48..b1e126bc3271 100644 --- a/devel/autoconf261/Makefile +++ b/devel/autoconf261/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile index 824ee0a20c48..b1e126bc3271 100644 --- a/devel/autoconf262/Makefile +++ b/devel/autoconf262/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile index 824ee0a20c48..b1e126bc3271 100644 --- a/devel/autoconf267/Makefile +++ b/devel/autoconf267/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile index 824ee0a20c48..b1e126bc3271 100644 --- a/devel/autoconf268/Makefile +++ b/devel/autoconf268/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ missing mkinstalldirs diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index 32d014e6e156..24561fc8cc1b 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} \ --infodir=${PREFIX}/info -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INFO= automake${BUILD_VERSION} diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile index 499093ff20b8..78829c1b3d2e 100644 --- a/devel/automake15/Makefile +++ b/devel/automake15/Makefile @@ -27,7 +27,7 @@ USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AUTOCONF=autoconf253 AUTOHEADER=autoheader253 MAKEINFO=makeinfo CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes post-patch: diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index 32d014e6e156..24561fc8cc1b 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} \ --infodir=${PREFIX}/info -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INFO= automake${BUILD_VERSION} diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile index 0e308ff1d1c8..49d0abdbd66b 100644 --- a/devel/avr-binutils/Makefile +++ b/devel/avr-binutils/Makefile @@ -21,8 +21,8 @@ WRKSRC= ${WRKDIR}/binutils-${PORTVERSION} USE_BZIP2= yes USE_GMAKE= yes CONFIGURE_ARGS= --target=avr -.if (${ARCH} == "amd64") -ARCH= x86_64 +.if (${MACHINE_ARCH} == "amd64") +MACHINE_ARCH= x86_64 .endif USE_INC_LIBTOOL_VER= 13 LIBTOOLFILES= configure bfd/configure binutils/configure etc/configure \ diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile index ba15ef8bc014..74114979cda0 100644 --- a/devel/avr-gcc-3/Makefile +++ b/devel/avr-gcc-3/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= --target=avr --disable-nls MAKE_FLAGS= LANGUAGES="c c++" # get rid of that silly -mcpu=pentiumpro FreeBSD 5+ is so fond of. :-( -MAKE_ENV= ARCH=avr +MAKE_ENV= MACHINE_ARCH=avr MAN1= avr-cpp.1 avr-gcc.1 avr-g++.1 avr-gcov.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index ba15ef8bc014..74114979cda0 100644 --- a/devel/avr-gcc/Makefile +++ b/devel/avr-gcc/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS= --target=avr --disable-nls MAKE_FLAGS= LANGUAGES="c c++" # get rid of that silly -mcpu=pentiumpro FreeBSD 5+ is so fond of. :-( -MAKE_ENV= ARCH=avr +MAKE_ENV= MACHINE_ARCH=avr MAN1= avr-cpp.1 avr-gcc.1 avr-g++.1 avr-gcov.1 MAN7= fsf-funding.7 gfdl.7 gpl.7 diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile index c9f65a35948b..f446f3647112 100644 --- a/devel/bison-devel/Makefile +++ b/devel/bison-devel/Makefile @@ -24,7 +24,7 @@ NO_LATEST_LINK= yes USE_BZIP2= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/bison/Makefile b/devel/bison/Makefile index 6191cda7cf0e..b9e512330f17 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -22,7 +22,7 @@ CONFLICTS= bison-1.8[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile index 6191cda7cf0e..b9e512330f17 100644 --- a/devel/bison175/Makefile +++ b/devel/bison175/Makefile @@ -22,7 +22,7 @@ CONFLICTS= bison-1.8[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile index 4150439a787b..39d5bb440cb3 100644 --- a/devel/bison1875/Makefile +++ b/devel/bison1875/Makefile @@ -23,7 +23,7 @@ CONFLICTS= bison-1.7[0-9]* NO_LATEST_LINK= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile index 4150439a787b..39d5bb440cb3 100644 --- a/devel/bison2/Makefile +++ b/devel/bison2/Makefile @@ -23,7 +23,7 @@ CONFLICTS= bison-1.7[0-9]* NO_LATEST_LINK= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile index 4150439a787b..39d5bb440cb3 100644 --- a/devel/bison20/Makefile +++ b/devel/bison20/Makefile @@ -23,7 +23,7 @@ CONFLICTS= bison-1.7[0-9]* NO_LATEST_LINK= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ MAKEINFO="makeinfo --no-split" diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index acd471c6e22e..3bb936480ecb 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -28,6 +28,6 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .include diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile index 0b252682ddce..c62f7cb72470 100644 --- a/devel/c_c++_reference/Makefile +++ b/devel/c_c++_reference/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_KDELIBS_VER= 3 USE_GMAKE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes post-patch: diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index 41b6300e7269..8dae8acbdb14 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ahze@FreeBSD.org COMMENT= A tool to minimize the compile time of C/C++ programs GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= ccache.1 PLIST_FILES= bin/ccache diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile index 2e0c8db03b61..90ec3fcc9efe 100644 --- a/devel/cdialog/Makefile +++ b/devel/cdialog/Makefile @@ -21,7 +21,7 @@ COMMENT= An enhanced version of 'dialog' to work with ncurses USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKEFILE= makefile MAN1= cdialog.1 diff --git a/devel/cook/Makefile b/devel/cook/Makefile index f0b6d73f75a6..adcf8b8c6922 100644 --- a/devel/cook/Makefile +++ b/devel/cook/Makefile @@ -17,7 +17,7 @@ COMMENT= Like make(1), but more powerful and clean GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib \ YACC=yacc -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= c_incl.1 cook.1 cook_bom.1 cook_lic.1 cook_rsh.1 cookfp.1 cooktime.1 \ find_libs.1 make2cook.1 roffpp.1 diff --git a/devel/cproto/Makefile b/devel/cproto/Makefile index c5bbb08d4b12..816ba9a6a148 100644 --- a/devel/cproto/Makefile +++ b/devel/cproto/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generate C function prototypes and convert function definitions GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= cproto.1 PLIST_FILES= bin/cproto diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile index 3c98f48909ac..8517b8493eea 100644 --- a/devel/cstringbuffer/Makefile +++ b/devel/cstringbuffer/Makefile @@ -19,7 +19,7 @@ MAN3= csb.3 MANCOMPRESSED= no CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_FILES= include/csb.h lib/libcsb.a lib/libcsb.so lib/libcsb.so.1 diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index fe6012a446fe..bfd524663e42 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -21,7 +21,7 @@ SIG_FILES= ${DISTNAME}${EXTRACT_SUFX}.sig USE_PERL5= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-libwrap MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile index 07389f53c2b5..f2b4429be9fc 100644 --- a/devel/cvsnt/Makefile +++ b/devel/cvsnt/Makefile @@ -20,7 +20,7 @@ USE_LIBLTDL= yes USE_INC_LIBTOOL_VER= 13 USE_RC_SUBR= yes CONFIGURE_ARGS= --enable-fork -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG=yes USE_ICONV= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile index 523fbbd6f8c1..f293c8ac4090 100644 --- a/devel/cxref/Makefile +++ b/devel/cxref/Makefile @@ -19,7 +19,7 @@ COMMENT= C program cross-referencing & documentation tool USE_BISON= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-cxref-cpp ALL_TARGET= programs diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 680e2fa1f255..e07ac7408988 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -28,7 +28,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include/freelibiberty ${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \ --with-readline-libraries=/usr/lib diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index 0ee6edba2512..0d9b0b8030fb 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -15,7 +15,7 @@ MAINTAINER= jeremy@external.org COMMENT= Portable debug memory allocation library GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-threads --enable-shlib CFLAGS+= -fPIC USE_REINPLACE= yes diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index ff3682179b00..12509537d12e 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -61,7 +61,7 @@ QT_NONSTANDARD= yes # non-standard configure arguments CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL} --make ${GMAKE} \ --install "${INSTALL}" -.if ${ARCH:L} == alpha +.if ${MACHINE_ARCH:L} == alpha CONFIGURE_ARGS+= --enable-langs no .endif diff --git a/devel/fam/Makefile b/devel/fam/Makefile index 5899ba9a88e5..baa69560b01c 100644 --- a/devel/fam/Makefile +++ b/devel/fam/Makefile @@ -23,7 +23,7 @@ CFLAGS+= -Wno-deprecated USE_AUTOMAKE_VER=15 USE_AUTOCONF_VER=253 USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile index b773379e78d4..b752228b18c0 100644 --- a/devel/gaul/Makefile +++ b/devel/gaul/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS}" INSTALLS_SHLIB= yes diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile index 98a166fa4225..016b3fd6db27 100644 --- a/devel/gengetopt/Makefile +++ b/devel/gengetopt/Makefile @@ -16,7 +16,7 @@ MAINTAINER= cyrille.lefevre@laposte.net COMMENT= A tool for generating a C function which parses command line arguments GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes MAN1= gengetopt.1 diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index 494df9e826d3..a61e1e08a17e 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -7,7 +7,17 @@ # PORTNAME= gindent +<<<<<<< Makefile +<<<<<<< Makefile PORTVERSION= 2.2.9 +PORTREVISION= 0 +======= +PORTVERSION= 2.2.8a +PORTREVISION= 3 +>>>>>>> 1.29 +======= +PORTVERSION= 2.2.9 +>>>>>>> 1.30 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= indent diff --git a/devel/global/Makefile b/devel/global/Makefile index 4d46f3a21979..a8342cdb704c 100644 --- a/devel/global/Makefile +++ b/devel/global/Makefile @@ -17,7 +17,7 @@ COMMENT= A source code tag system GNU_CONFIGURE= yes USE_PERL5= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= gctags.1 global.1 gozilla.1 gtags.1 htags.1 INFO= global diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile index d52c0c2e21e4..2e6d3f6e249a 100644 --- a/devel/gnu-autoconf/Makefile +++ b/devel/gnu-autoconf/Makefile @@ -32,7 +32,7 @@ INFO= autoconf standards CONFIGURE_ENV+= CONFIG_SHELL=${SH} CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --without-lispdir -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 \ autoupdate.1 config.guess.1 config.sub.1 ifnames.1 diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index 2db887c2600d..3634e271570c 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -29,7 +29,7 @@ NO_MTREE= yes CONFIGURE_ENV= AUTOCONF=${LOCALBASE}/gnu-autotools/bin/autoconf \ AUTOHEADER=${LOCALBASE}/gnu-autotools/bin/autoheader \ MAKEINFO="makeinfo --no-split" -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} post-install: @${CAT} ${PKGMESSAGE} diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile index 1cdc121c672d..12232e376512 100644 --- a/devel/gnu-libtool/Makefile +++ b/devel/gnu-libtool/Makefile @@ -24,7 +24,7 @@ NO_MTREE= yes INFO= libtool CONFIGURE_ARGS= --disable-ltdl-install CONFIGURE_ENV= PREFIX=${PREFIX} -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} post-install: @${CAT} ${PKGMESSAGE} diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile index c765ce137e3a..5ec16c0d23a1 100644 --- a/devel/gnustep/Makefile +++ b/devel/gnustep/Makefile @@ -33,10 +33,10 @@ GNUSTEP_BACK_PORT?= x11-toolkits/gnustep-back .include -.if ${ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" GNU_ARCH= ix86 .else -GNU_ARCH= ${ARCH} +GNU_ARCH= ${MACHINE_ARCH} .endif SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile index 1225c98b3daa..fa835861d946 100644 --- a/devel/gputils/Makefile +++ b/devel/gputils/Makefile @@ -15,7 +15,7 @@ MAINTAINER= sam@rfc1149.net COMMENT= GPUTILS is a set of utilities for Microchip PIC microcontrollers GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= gpal.1 gpasm.1 gpdasm.1 gplib.1 gplink.1 gputils.1 gpvc.1 gpvo.1 diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile index d628722a6a01..26b0db0f5f83 100644 --- a/devel/gsoap/Makefile +++ b/devel/gsoap/Makefile @@ -17,7 +17,7 @@ COMMENT= Generator Tools for Coding SOAP/XML Web Services in C and C++ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} ONLY_FOR_ARCHS= i386 diff --git a/devel/gtgt/Makefile b/devel/gtgt/Makefile index a6600e08fd76..fc1aecc3d033 100644 --- a/devel/gtgt/Makefile +++ b/devel/gtgt/Makefile @@ -17,6 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= General (or GNU) template generation tools GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .include diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile index 83cfbc7e7721..722223ba7f9a 100644 --- a/devel/i386-rtems-g77/Makefile +++ b/devel/i386-rtems-g77/Makefile @@ -55,7 +55,7 @@ PATCH_STRIP= -p WITHOUT_CPU_CFLAGS= yes MAKE_FLAGS= LANGUAGES="f77" -MAKE_ENV= ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true +MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true pre-configure: @(cd ${WRKDIR} ; \ diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile index dcf2d82fba6f..6eb17bbd6edf 100644 --- a/devel/i386-rtems-gcc/Makefile +++ b/devel/i386-rtems-gcc/Makefile @@ -68,7 +68,7 @@ PATCH_STRIP= -p WITHOUT_CPU_CFLAGS= yes MAKE_FLAGS= LANGUAGES="c c++ java" -MAKE_ENV= ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true +MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true MAN1= ${LCLTARGET}-gcc.1 ${LCLTARGET}-g++.1 ${LCLTARGET}-gcj.1 \ cpp.1 gcov.1 gcjh.1 jv-scan.1 jcf-dump.1 gij.1 \ diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile index 376596b986d1..b2484d5a1083 100644 --- a/devel/i386-rtems-objc/Makefile +++ b/devel/i386-rtems-objc/Makefile @@ -55,7 +55,7 @@ PATCH_STRIP= -p WITHOUT_CPU_CFLAGS= yes MAKE_FLAGS= LANGUAGES="objc" -MAKE_ENV= ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true +MAKE_ENV= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true pre-configure: @(cd ${WRKDIR} ; \ diff --git a/devel/jam/Makefile b/devel/jam/Makefile index 9662217516e0..e4927c3ac8bf 100644 --- a/devel/jam/Makefile +++ b/devel/jam/Makefile @@ -32,7 +32,7 @@ pre-patch: s|^ jam| ./jam|g' ${WRKSRC}/Makefile do-install: -.if ${ARCH} == "alpha" +.if ${MACHINE_ARCH} == "alpha" ${INSTALL_PROGRAM} ${WRKSRC}/bin.freebsdaxp/jam ${PREFIX}/bin .else ${INSTALL_PROGRAM} ${WRKSRC}/bin.freebsd/jam ${PREFIX}/bin diff --git a/devel/jrtplib/Makefile b/devel/jrtplib/Makefile index 1b6eae2e3782..1b3e418e3c49 100644 --- a/devel/jrtplib/Makefile +++ b/devel/jrtplib/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_SHLIB= yes NO_FILTER_SHLIBS= yes -CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-jthread .include diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile index 203ae12a74d9..4ce32e6a9c1b 100644 --- a/devel/kaptain/Makefile +++ b/devel/kaptain/Makefile @@ -20,7 +20,7 @@ USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-mt \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include diff --git a/devel/kimwitu++/Makefile b/devel/kimwitu++/Makefile index 5cf06a301201..58bf1cb7be66 100644 --- a/devel/kimwitu++/Makefile +++ b/devel/kimwitu++/Makefile @@ -19,7 +19,7 @@ USE_BISON= yes USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= kc++.1 PLIST_FILES= bin/kc++ diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile index 29d1b5f27457..be9aec10050f 100644 --- a/devel/libbfd/Makefile +++ b/devel/libbfd/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS= --enable-install-libbfd \ --disable-nls \ --without-pic \ --enable-targets=all -.if (${ARCH} == "amd64") +.if (${MACHINE_ARCH} == "amd64") CONFIGURE_ARGS+= --host=x86_64-portbld-freebsd${OSREL} .endif diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile index 6b551d2acbdb..40de09c171ee 100644 --- a/devel/libchipcard-kde/Makefile +++ b/devel/libchipcard-kde/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= CONFIGURE_ARGS+= --with-distri=freebsd --with-kde3-prefix=${LOCALBASE}\ --with-applnk-dir=${PREFIX}/share/applnk/Utilities \ - --build=${ARCH}-portbld-freebsd${OSREL} + --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_KDELIBS_VER= 3 USE_REINPLACE= yes diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile index 6cdae68c7591..3cb64698fa4b 100644 --- a/devel/libchipcard/Makefile +++ b/devel/libchipcard/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_TARGET= CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --with-distri=freebsd MAN1= ctfstool.1 chipcardd.1 geldkarte.1 hbcicard.1 \ diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile index 6f580dbf6fcb..620a7e512590 100644 --- a/devel/libfs++/Makefile +++ b/devel/libfs++/Makefile @@ -18,7 +18,7 @@ COMMENT= C++ library which provides a file_iterator class USE_REINPLACE= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes post-patch: diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile index 5c8bbce9f630..49aebf8a8945 100644 --- a/devel/libghthash/Makefile +++ b/devel/libghthash/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generic Hash Table USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index d61eba159a16..756962732591 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -24,6 +24,6 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .include diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile index a1847d018d85..b1ff59dcab26 100644 --- a/devel/libgutenfetch/Makefile +++ b/devel/libgutenfetch/Makefile @@ -17,7 +17,7 @@ COMMENT= A library that allows application developers to connect to PG LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile index 47a810e833bb..39974868ec9f 100644 --- a/devel/libmimedir/Makefile +++ b/devel/libmimedir/Makefile @@ -14,7 +14,7 @@ MAINTAINER= boris@brooknet.com.au COMMENT= Library for parsing RFC2425 MIME Directory Profile information GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 13 USE_BISON= yes diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index dfa46b7cfa5e..a437ddc33ac0 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -19,6 +19,6 @@ USE_GMAKE= yes USE_GNOME= glib12 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} .include diff --git a/devel/libpreps-devel/Makefile b/devel/libpreps-devel/Makefile index 7d8bf7d0ffed..65056280b63f 100644 --- a/devel/libpreps-devel/Makefile +++ b/devel/libpreps-devel/Makefile @@ -27,7 +27,7 @@ USE_REINPLACE= yes USE_GNOME= glib12 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} .include diff --git a/devel/libpreps/Makefile b/devel/libpreps/Makefile index 15b1cf963c1a..e6544784ed1b 100644 --- a/devel/libpreps/Makefile +++ b/devel/libpreps/Makefile @@ -23,7 +23,7 @@ USE_GNOME= glib12 USE_INC_LIBTOOL_VER=13 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile index 03ba86111d15..ca403a5c3b39 100644 --- a/devel/libtar/Makefile +++ b/devel/libtar/Makefile @@ -16,7 +16,7 @@ COMMENT= A library for manipulating POSIX and GNU tar files USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .include .include "files/manpages" diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile index eb1e12428dab..7f27823e7f59 100644 --- a/devel/libtool13/Makefile +++ b/devel/libtool13/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install \ --program-suffix=${BUILD_VERSION} CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION} -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INFO= libtool${BUILD_VERSION} diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile index dd263df16ed9..1cc18342a509 100644 --- a/devel/libtool15/Makefile +++ b/devel/libtool15/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS?= --disable-ltdl-install CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION} CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION} -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes .if ${PORTNAME} == "libtool" diff --git a/devel/libzt/Makefile b/devel/libzt/Makefile index 0cff383e9d58..7b63fd3517b4 100644 --- a/devel/libzt/Makefile +++ b/devel/libzt/Makefile @@ -18,7 +18,7 @@ USE_LIBTOOL_VER= 13 USE_REINPLACE= yes USE_GETOPT_LONG= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/devel/lightning/Makefile b/devel/lightning/Makefile index 289c226744aa..c6f1a08a5dd0 100644 --- a/devel/lightning/Makefile +++ b/devel/lightning/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386 sparc64 USE_PERL5_BUILD= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" MAN1= lightningize.1 diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile index 1a43a4f08d39..a310ff14145b 100644 --- a/devel/linux-allegro/Makefile +++ b/devel/linux-allegro/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile index 1a43a4f08d39..a310ff14145b 100644 --- a/devel/linux-f10-allegro/Makefile +++ b/devel/linux-f10-allegro/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile index c9b2fc401597..f076547bce49 100644 --- a/devel/linux-f10-libglade/Makefile +++ b/devel/linux-f10-libglade/Makefile @@ -13,6 +13,6 @@ CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade -RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile index c9b2fc401597..f076547bce49 100644 --- a/devel/linux-f10-libglade2/Makefile +++ b/devel/linux-f10-libglade2/Makefile @@ -13,6 +13,6 @@ CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade -RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile index 048d9dff50eb..28845887cf76 100644 --- a/devel/linux-f10-sdl12/Makefile +++ b/devel/linux-f10-sdl12/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel linux MASTER_SITES= http://www.libsdl.org/release/ \ ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${ARCH} +DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 alpha DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile index 1a43a4f08d39..a310ff14145b 100644 --- a/devel/linux-f8-allegro/Makefile +++ b/devel/linux-f8-allegro/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= devel linux MASTER_SITES= http://membres.lycos.fr/ebotcazou/allegro/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile index c9b2fc401597..f076547bce49 100644 --- a/devel/linux-f8-libglade/Makefile +++ b/devel/linux-f8-libglade/Makefile @@ -13,6 +13,6 @@ CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade -RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile index c9b2fc401597..f076547bce49 100644 --- a/devel/linux-f8-libglade2/Makefile +++ b/devel/linux-f8-libglade2/Makefile @@ -13,6 +13,6 @@ CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade -RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f8-sdl12/Makefile b/devel/linux-f8-sdl12/Makefile index 048d9dff50eb..28845887cf76 100644 --- a/devel/linux-f8-sdl12/Makefile +++ b/devel/linux-f8-sdl12/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel linux MASTER_SITES= http://www.libsdl.org/release/ \ ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${ARCH} +DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 alpha DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile index c9b2fc401597..f076547bce49 100644 --- a/devel/linux-libglade/Makefile +++ b/devel/linux-libglade/Makefile @@ -13,6 +13,6 @@ CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade -RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile index c9b2fc401597..f076547bce49 100644 --- a/devel/linux-libglade2/Makefile +++ b/devel/linux-libglade2/Makefile @@ -13,6 +13,6 @@ CATEGORIES= devel linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libglade -RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile index 048d9dff50eb..28845887cf76 100644 --- a/devel/linux-sdl12/Makefile +++ b/devel/linux-sdl12/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel linux MASTER_SITES= http://www.libsdl.org/release/ \ ftp://ftp.icm.edu.pl/vol/rzm9/linux-pld/pool/s/SDL/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${ARCH} +DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 alpha DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile index 9d5f11589e9f..561f5ef77188 100644 --- a/devel/linux_devtools-6/Makefile +++ b/devel/linux_devtools-6/Makefile @@ -10,19 +10,19 @@ PORTVERSION= 6.1 PORTREVISION= 2 CATEGORIES= devel emulators linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= ${PORTVERSION}/en/os/${ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= ${PORTVERSION}/en/os/${MACHINE_ARCH}/RedHat/RPMS DISTFILES= ${RPM_KERNEL_HEADERS} \ ${RPM_GLIBC_DEVEL} \ - make-3.77-6.${ARCH}.rpm \ - cpp-1.1.2-24.${ARCH}.rpm \ - egcs-1.1.2-24.${ARCH}.rpm \ - egcs-c++-1.1.2-24.${ARCH}.rpm \ - egcs-g77-1.1.2-24.${ARCH}.rpm \ + make-3.77-6.${MACHINE_ARCH}.rpm \ + cpp-1.1.2-24.${MACHINE_ARCH}.rpm \ + egcs-1.1.2-24.${MACHINE_ARCH}.rpm \ + egcs-c++-1.1.2-24.${MACHINE_ARCH}.rpm \ + egcs-g77-1.1.2-24.${MACHINE_ARCH}.rpm \ ${RPM_GDB} \ ${RPM_X_DEVEL} PATCH_SITES= ${MASTER_SITE_REDHAT_LINUX} -PATCH_SITE_SUBDIR= updates/${PORTVERSION}/en/os/${ARCH} +PATCH_SITE_SUBDIR= updates/${PORTVERSION}/en/os/${MACHINE_ARCH} PATCHFILES= MAINTAINER= freebsd-emulation@FreeBSD.org @@ -39,11 +39,11 @@ NO_BUILD= yes NO_FILTER_SHLIBS= yes NO_MTREE= yes USE_LINUX= 6 -PLIST= ${PKGDIR}/pkg-plist.${ARCH} +PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} .include -.if (${ARCH} == "i386") +.if (${MACHINE_ARCH} == "i386") RPM_GDB= gdb-4.18-4.i386.rpm RPM_GLIBC_DEVEL= glibc-devel-2.1.2-11.i386.rpm RPM_KERNEL_HEADERS= kernel-headers-2.2.12-20.i386.rpm diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile index ce6e58a5ebc9..0973c16d1bd2 100644 --- a/devel/linux_devtools-7/Makefile +++ b/devel/linux_devtools-7/Makefile @@ -10,14 +10,14 @@ PORTVERSION= 7.1 PORTREVISION= 3 CATEGORIES= devel emulators linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= ${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= ${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS DISTFILES= ${RPM_MAKE} \ - binutils-2.10.91.0.2-3.${ARCH}.rpm \ + binutils-2.10.91.0.2-3.${MACHINE_ARCH}.rpm \ ${RPM_GDB} EXTRACT_ONLY= PATCH_SITES= ${MASTER_SITE_REDHAT_LINUX} -PATCH_SITE_SUBDIR= updates/${PORTVERSION}/${LANG}/os/${ARCH} +PATCH_SITE_SUBDIR= updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH} PATCHFILES= ${UPDATES} MAINTAINER= freebsd-emulation@FreeBSD.org @@ -37,21 +37,21 @@ NO_FILTER_SHLIBS= yes NO_MTREE= yes PLIST= ${WRKDIR}/plist RESTRICTED= "binaries under GNU GPL without accompanying source" -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} # Let's avoid hardcoding 'en' as the language. LANG= en .include -.if (${ARCH} == "alpha") +.if (${MACHINE_ARCH} == "alpha") PATCH_SITES= \ ftp://ftp2.compaq.com/pub/linux/RedHat/7.2-alpha/updates/rpms/alpha/ \ ftp://alpha.crl.dec.com/pub/linux/redhat/7.2-alpha/updates/rpms/alpha/ PORTREVISION= 2 .endif -.if (${ARCH} == "i386") +.if (${MACHINE_ARCH} == "i386") RPM_GDB= gdb-5.0rh-5.i386.rpm RPM_MAKE= make-3.79.1-5.i386.rpm UPDATES= XFree86-devel-4.1.0-50.i386.rpm \ @@ -94,7 +94,7 @@ pre-install: cd ${WRKSRC}/tmp; rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${ii} | cpio -id .endfor cd ${WRKSRC}/tmp; ${FIND} * -type f -o -type l > ${PLIST} -.if (${ARCH} == "i386") +.if (${MACHINE_ARCH} == "i386") ${ECHO_CMD} boot/kernel.h >> ${PLIST} .endif cd ${WRKSRC}/tmp; ${FIND} -d * -type d | ${GREP} -vE "man|locale" | \ diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile index a0d04cf4d732..0d9d81d28a06 100644 --- a/devel/log4c/Makefile +++ b/devel/log4c/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Logging for C Library USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile index 0686c4d309e0..b349e2d40293 100644 --- a/devel/log4cplus/Makefile +++ b/devel/log4cplus/Makefile @@ -18,7 +18,7 @@ COMMENT= A logging library for C++ INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile index a7d261111113..bf72e6b42532 100644 --- a/devel/log4cpp/Makefile +++ b/devel/log4cpp/Makefile @@ -17,7 +17,7 @@ COMMENT= A library of C++ classes for flexible logging USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-pthreads --disable-html-docs INSTALLS_SHLIB= yes diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile index a697da9524df..3ebaa263ae8e 100644 --- a/devel/log4cxx/Makefile +++ b/devel/log4cxx/Makefile @@ -37,7 +37,7 @@ LIBTOOL_VARS= --force --automake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -I${LOCALBASE}/lib -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" INSTALLS_SHLIB= yes USE_REINPLACE= yes diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile index 70f7c4dfa809..cedb6fb14938 100644 --- a/devel/lwp/Makefile +++ b/devel/lwp/Makefile @@ -15,7 +15,7 @@ COMMENT= A userspace thread library USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile index 510512996318..bed0196b8d78 100644 --- a/devel/m17n-db/Makefile +++ b/devel/m17n-db/Makefile @@ -20,7 +20,7 @@ COMMENT= Data files for the m17n library USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-charmaps=${CHARMAPSDIR} M17N_DISTFILE= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/mico/Makefile b/devel/mico/Makefile index aede62bbc5a1..b085c2da1b4c 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOCONF_VER= 259 -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} #CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} \ # CXXFLAGS="${CXXFLAGS}" CPP=${CPP} diff --git a/devel/mm/Makefile b/devel/mm/Makefile index 2250258bd908..4b77d8b9ac07 100644 --- a/devel/mm/Makefile +++ b/devel/mm/Makefile @@ -16,7 +16,7 @@ COMMENT= Shared memory allocation library for pre-forked process models INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= mm-config.1 MAN3= mm.3 diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index cc873547c165..5ab8e984459b 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -24,7 +24,7 @@ USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index fa132c45e9da..2d70267c09b9 100644 --- a/devel/nasm/Makefile +++ b/devel/nasm/Makefile @@ -18,7 +18,7 @@ COMMENT= General-purpose multi-platform x86 assembler USE_BZIP2= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} PLIST_FILES= bin/nasm bin/nasm-%%VERSION%% bin/ndisasm diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 5db04f405560..b86f1fb13d56 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-static --enable-shared \ --disable-more-warnings CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" -CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= oafd.1 diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile index a47f1d4cffeb..045cbba81b9f 100644 --- a/devel/omniNotify/Makefile +++ b/devel/omniNotify/Makefile @@ -37,7 +37,7 @@ USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 CONFIGURE_SCRIPT= ../configure -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \ CPP=${CPP} PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-omniorb=${LOCALBASE} diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index 89918dc25f48..520bb9f3b863 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -15,7 +15,7 @@ MAINTAINER= sem@FreeBSD.org COMMENT= A robust high performance CORBA ORB for C++ and Python CONFIGURE_WRKSRC= ${WRKSRC}/build -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} USE_GMAKE= yes diff --git a/devel/p4v/Makefile b/devel/p4v/Makefile index 4c6ddfa264e3..e44f4e4b6498 100644 --- a/devel/p4v/Makefile +++ b/devel/p4v/Makefile @@ -24,8 +24,8 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_WRKSUBDIR= yes -PLIST= ${MASTERDIR}/pkg-plist.${ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} P4V_DOCS_DIR= P4VResources/p4vhelp P4V_DOCS= About_Perforce_products.html About_file_icons.html \ diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile index 132d6171cf51..1b04c2afda4a 100644 --- a/devel/pcre++/Makefile +++ b/devel/pcre++/Makefile @@ -21,7 +21,7 @@ PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config USE_REINPLACE= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \ LDFLAGS="`${PCRE_CONFIG} --libs`" INSTALLS_SHLIB= yes diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 7db31ea60c6b..c4f65c82366d 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= \ .endif CONFIGURE_TARGET= \ - --build=${ARCH}-portbld-freebsd${OSREL} + --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= pcregrep.1 pcretest.1 MAN3= pcre.3 pcre_compile.3 pcre_config.3 \ diff --git a/devel/php-xdebug/Makefile b/devel/php-xdebug/Makefile index 6c7b7f9e4b76..c896e62bc6cf 100644 --- a/devel/php-xdebug/Makefile +++ b/devel/php-xdebug/Makefile @@ -18,7 +18,7 @@ COMMENT= Xdebug extension for PHP USE_PHP= yes USE_PHPIZE= yes CONFIGURE_ARGS= --enable-xdebug --with-php-config=${PREFIX}/bin/php-config -CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message post-build: diff --git a/devel/phptags/Makefile b/devel/phptags/Makefile index a99d3f57d94b..6e23cd4775d4 100644 --- a/devel/phptags/Makefile +++ b/devel/phptags/Makefile @@ -15,7 +15,7 @@ MAINTAINER= novel@FreeBSD.org COMMENT= Create a tags file from PHP sources GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= phptags.1 PLIST_FILES= bin/phptags \ diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 266c1ab497d7..4e9b892f2a75 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -38,7 +38,7 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile index acd1d68f0d53..0604553372aa 100644 --- a/devel/poslib/Makefile +++ b/devel/poslib/Makefile @@ -17,7 +17,7 @@ COMMENT= Posadis C++ DNS library GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 INSTALLS_SHLIB= yes diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile index 6332280a368c..bf036e441a0e 100644 --- a/devel/preps-gui/Makefile +++ b/devel/preps-gui/Makefile @@ -25,7 +25,7 @@ USE_GNOME= gtk12 gnomelibs MAN1= preps.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-pgsqldir=${LOCALBASE} \ --with-plpgsqldir=${LOCALBASE} \ --with-libprepsdir=${LOCALBASE} diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile index 15b1cf963c1a..e6544784ed1b 100644 --- a/devel/prepstools/Makefile +++ b/devel/prepstools/Makefile @@ -23,7 +23,7 @@ USE_GNOME= glib12 USE_INC_LIBTOOL_VER=13 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/devel/privman/Makefile b/devel/privman/Makefile index 914444bd90be..8a85cfcc14b7 100644 --- a/devel/privman/Makefile +++ b/devel/privman/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e \ diff --git a/devel/pth/Makefile b/devel/pth/Makefile index 3a9f667ee0ef..7f3a9451627c 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -18,7 +18,7 @@ COMMENT= GNU Portable Threads INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/pth GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-pthread \ --enable-syscall-soft \ --enable-optimize \ diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile index 79910c9d0e75..b8db78424495 100644 --- a/devel/py-omniorb/Makefile +++ b/devel/py-omniorb/Makefile @@ -38,7 +38,7 @@ INSTALLS_SHLIB= yes USE_REINPLACE= yes CONFIGURE_SCRIPT= ../configure -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \ CPP=${CPP} PYTHON=${PYTHON_CMD} CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE} diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile index fed6139b61c4..1a0000c1e9b6 100644 --- a/devel/ragel/Makefile +++ b/devel/ragel/Makefile @@ -18,7 +18,7 @@ USE_REINPLACE= yes USE_BISON= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= AWK="${AWK}" MAN1= ragel.1 diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile index 88e922ee436e..bca5eb2cd61f 100644 --- a/devel/rlwrap/Makefile +++ b/devel/rlwrap/Makefile @@ -16,7 +16,7 @@ COMMENT= Readline wrapper USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= ptyttylib_cv_ptys=BSD MAN1= rlwrap.1 diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile index 89f3de680f6e..3afb73221e24 100644 --- a/devel/ruby-gnustep/Makefile +++ b/devel/ruby-gnustep/Makefile @@ -59,10 +59,10 @@ COMBOLIBDIR= ${SYSLIBDIR} MAKE_ENV+= GNUSTEP_FLATTENED=yes .include -.if ${ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" GNU_ARCH= ix86 .else -GNU_ARCH= ${ARCH} +GNU_ARCH= ${MACHINE_ARCH} .endif MAKEFILE= GNUmakefile diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index c198bb13ce5f..db472b0cd0f3 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -19,7 +19,7 @@ USE_GNOME= pkgconfig USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ssl --disable-pcre -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ PTHREADLIB="${PTHREAD_LIBS}" INSTALLS_SHLIB= yes diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 9f0662ca21ac..cc25ec891861 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-video-aalib -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile index f29eaa67883c..1afad1decb4a 100644 --- a/devel/shmap/Makefile +++ b/devel/shmap/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= mm.13:${PORTSDIR}/devel/mm USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 1e8a5537ec32..7f2ab2642895 100644 --- a/devel/silc-toolkit/Makefile +++ b/devel/silc-toolkit/Makefile @@ -30,7 +30,7 @@ COMMENT= Secure Internet Live Conferencing (SILC) network toolkit USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GNOME= glib12 USE_GMAKE= yes CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc/${PORTNAME} \ diff --git a/devel/splint/Makefile b/devel/splint/Makefile index 1e7b8bae1020..7c408674df67 100644 --- a/devel/splint/Makefile +++ b/devel/splint/Makefile @@ -18,8 +18,7 @@ COMMENT= A tool for statically checking sourcecode for security vulnerabilities USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -USE_GMAKE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= splint.1 diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile index a9156a841e87..1b13ada96bf1 100644 --- a/devel/subversion-devel/Makefile +++ b/devel/subversion-devel/Makefile @@ -19,7 +19,7 @@ INSTALLS_SHLIB= yes USE_BZIP2= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile index a9156a841e87..1b13ada96bf1 100644 --- a/devel/subversion-freebsd/Makefile +++ b/devel/subversion-freebsd/Makefile @@ -19,7 +19,7 @@ INSTALLS_SHLIB= yes USE_BZIP2= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index a9156a841e87..1b13ada96bf1 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -19,7 +19,7 @@ INSTALLS_SHLIB= yes USE_BZIP2= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile index a9156a841e87..1b13ada96bf1 100644 --- a/devel/subversion16/Makefile +++ b/devel/subversion16/Makefile @@ -19,7 +19,7 @@ INSTALLS_SHLIB= yes USE_BZIP2= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile index f6edbf9842a5..8f346c859a81 100644 --- a/devel/valgrind-snapshot/Makefile +++ b/devel/valgrind-snapshot/Makefile @@ -26,7 +26,7 @@ USE_GNOME= pkgconfig USE_PERL5_BUILD=yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index da28f73720d0..b50001940270 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_GMAKE= yes USE_GNOME= pkgconfig GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--enable-maintainer-mode USE_REINPLACE= yes USE_PERL5_BUILD=yes diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile index 10cdbfbd3eab..577babbf6580 100644 --- a/devel/zziplib/Makefile +++ b/devel/zziplib/Makefile @@ -22,7 +22,7 @@ USE_GNOME= gnomehack USE_INC_LIBTOOL_VER= 13 LIBTOOLFLAGS= --disable-ltlibs --release-ignore GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include -- cgit v1.2.3