diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2005-04-11 08:04:41 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2005-04-11 08:04:41 +0000 |
| commit | f2fc2d60ae226a1b8d5411fb4aab91ea92be6f91 (patch) | |
| tree | e9a77f53d4fe679665594e718ad34b49668507cc | |
| parent | 063f8ca62467e4709e58c8bb6b67c85970fe28a1 (diff) | |
| download | ports-f2fc2d60ae226a1b8d5411fb4aab91ea92be6f91.tar.gz ports-f2fc2d60ae226a1b8d5411fb4aab91ea92be6f91.zip | |
Assist getting more ports working on AMD64 by obeying the
Ports Collection documentation and use 'ARCH' rather than 'MACHINE_ARCH'.
Notes
Notes:
svn path=/head/; revision=132992
900 files changed, 1049 insertions, 1020 deletions
diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile index c36be5ca0bdd..1909974d02e9 100644 --- a/archivers/advancecomp/Makefile +++ b/archivers/advancecomp/Makefile @@ -17,7 +17,7 @@ COMMENT= Recompression utilities for .ZIP, .PNG, .MNG and .GZ files USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= advdef.1 advmng.1 advpng.1 advzip.1 diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile index 1c63095242b4..4d7756da37a1 100644 --- a/archivers/arj/Makefile +++ b/archivers/arj/Makefile @@ -17,7 +17,7 @@ COMMENT= Open-source ARJ USE_REINPLACE= yes USE_AUTOCONF_VER= 259 USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_WRKSRC= ${WRKSRC}/gnu CONFIGURE_ENV= CFLAGS="-fPIC" MAKEFILE= GNUmakefile diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile index 924398d82a0c..556e5b466312 100644 --- a/archivers/cabextract/Makefile +++ b/archivers/cabextract/Makefile @@ -15,7 +15,7 @@ COMMENT= A program to extract Microsoft cabinet (.CAB) files USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MANLANG= "" ja MAN1= cabextract.1 diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index a4952a819095..a269b477c3ae 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} \ --libdir=${PREFIX}/lib CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/archivers/dynamite/Makefile b/archivers/dynamite/Makefile index 514958e39a85..ac9991b8eea7 100644 --- a/archivers/dynamite/Makefile +++ b/archivers/dynamite/Makefile @@ -15,7 +15,7 @@ MAINTAINER= boris@brooknet.com.au COMMENT= Decompress data compressed with PKWARE Data Compression Library GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile index 9ada5d066558..44dcf9a1e7a2 100644 --- a/archivers/gzip/Makefile +++ b/archivers/gzip/Makefile @@ -21,7 +21,7 @@ COMMENT= A compression utility designed to be a replacement for compress USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= gunzip.1 gzexe.1 gzip.1 zcat.1 zcmp.1 zdiff.1 zforce.1 \ zgrep.1 zless.1 zmore.1 znew.1 diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile index 514958e39a85..ac9991b8eea7 100644 --- a/archivers/libdynamite/Makefile +++ b/archivers/libdynamite/Makefile @@ -15,7 +15,7 @@ MAINTAINER= boris@brooknet.com.au COMMENT= Decompress data compressed with PKWARE Data Compression Library GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile index c5f93e0e2453..04173fbedfc5 100644 --- a/archivers/liborange/Makefile +++ b/archivers/liborange/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= synce.0:${PORTSDIR}/palm/synce-libsynce \ unshield.0:${PORTSDIR}/archivers/unshield GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libsynce=${LOCALBASE} USE_ICONV= yes USE_LIBTOOL_VER=15 diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile index bd11f6006d60..f1fcc8d4d4b3 100644 --- a/archivers/lzop/Makefile +++ b/archivers/lzop/Makefile @@ -16,7 +16,7 @@ COMMENT= Fast file compressor similar to gzip, using the LZO library LIB_DEPENDS= lzo.1:${PORTSDIR}/archivers/lzo GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/archivers/orange/Makefile b/archivers/orange/Makefile index c5f93e0e2453..04173fbedfc5 100644 --- a/archivers/orange/Makefile +++ b/archivers/orange/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= synce.0:${PORTSDIR}/palm/synce-libsynce \ unshield.0:${PORTSDIR}/archivers/unshield GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libsynce=${LOCALBASE} USE_ICONV= yes USE_LIBTOOL_VER=15 diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile index 03ca56e8bab6..fa061d98083a 100644 --- a/archivers/par2cmdline/Makefile +++ b/archivers/par2cmdline/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PORTDOCS= README PLIST_FILES= bin/par2 bin/par2create bin/par2repair bin/par2verify diff --git a/archivers/star/Makefile b/archivers/star/Makefile index 47442a43b10f..3a235909e8e0 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -24,14 +24,14 @@ MAN1= star.1 MLINKS= star.1 ustar.1 post-extract: -.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc" +.if ${ARCH} != "i386" || ${CC} != "cc" @${LN} -sf i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul + ${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul .endif do-install: @${INSTALL_PROGRAM} \ - ${WRKSRC}/star/OBJ/${MACHINE_ARCH}-freebsd-${CC}/star \ + ${WRKSRC}/star/OBJ/${ARCH}-freebsd-${CC}/star \ ${PREFIX}/bin @cd ${PREFIX}/bin ; ${LN} -f star ustar @${INSTALL_MAN} ${WRKSRC}/star/star.1 ${MANPREFIX}/man/man1 diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile index 73e74370980d..50d701cd2633 100644 --- a/archivers/tardy/Makefile +++ b/archivers/tardy/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Manipulate the file headers in tar archive files in various ways GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= tardy.1 PLIST_FILES= bin/tardy diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile index f3f1e07c73a5..a1a3710a69ae 100644 --- a/archivers/ucl/Makefile +++ b/archivers/ucl/Makefile @@ -16,7 +16,7 @@ COMMENT= A data compression library with low memory usage INSTALLS_SHLIB= yes USE_LIBTOOL_VER= 15 CONFIGURE_ARGS= --enable-shared -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PORTDOCS= AUTHORS NEWS README THANKS TODO diff --git a/astro/fooseti/Makefile b/astro/fooseti/Makefile index d109291c1d38..65f804a68add 100644 --- a/astro/fooseti/Makefile +++ b/astro/fooseti/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK+ frontend to SETI@Home GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/fooseti USE_GETTEXT= yes USE_GNOME= gtk12 diff --git a/astro/match/Makefile b/astro/match/Makefile index 1e109a25a856..e463de4a66fb 100644 --- a/astro/match/Makefile +++ b/astro/match/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A program for matching star lists GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/apply_match bin/match bin/project_coords diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index 078d5fd9ae30..973211d2483e 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -21,7 +21,7 @@ USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/ample/Makefile b/audio/ample/Makefile index 3e60a77237d0..20a59e9b7a00 100644 --- a/audio/ample/Makefile +++ b/audio/ample/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Allows you to listen to your own MP3's away from home GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= ample.1 MAN5= ample.conf.5 ample.html.5 diff --git a/audio/arts/Makefile b/audio/arts/Makefile index b8035555f378..ccb2219ff77a 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -37,7 +37,7 @@ _NO_KDE_FINAL= yes CFLAGS+= -DHAVE_VASPRINTF CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_TARGET= # empty -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include OPTIONS= ESD "Enable esound support" off \ diff --git a/audio/autocd/Makefile b/audio/autocd/Makefile index 1d449e1d0468..6188db4ffec6 100644 --- a/audio/autocd/Makefile +++ b/audio/autocd/Makefile @@ -14,7 +14,7 @@ MAINTAINER= KOT@MATPOCKuH.Ru COMMENT= Compact disc control utility GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= cdctl.1 acdplay.1 MAN8= autocd.8 MLINKS= cdctl.1 eject.1 cdctl.1 pause.1 diff --git a/audio/blop/Makefile b/audio/blop/Makefile index f261cdaf87cc..472c9d4fd8a2 100644 --- a/audio/blop/Makefile +++ b/audio/blop/Makefile @@ -19,7 +19,7 @@ USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-ladspa-prefix="${LOCALBASE}" diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile index 8b4bae29748d..934bafe694d5 100644 --- a/audio/bmp-faad/Makefile +++ b/audio/bmp-faad/Makefile @@ -32,7 +32,7 @@ USE_GMAKE= yes USE_GNOME= gtk20 USE_REINPLACE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-xmms --with-mp4v2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile index 8843e08ed32e..325d3bcdccca 100644 --- a/audio/boodler/Makefile +++ b/audio/boodler/Makefile @@ -31,7 +31,7 @@ LDCONFIG_DIRS= %%PREFIX%%/share/boodler/boodle DRIVER= FILE .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" PIC= --PIC .endif diff --git a/audio/cuetools/Makefile b/audio/cuetools/Makefile index 3117ecd4a0d6..b4d06acc0bc3 100644 --- a/audio/cuetools/Makefile +++ b/audio/cuetools/Makefile @@ -17,7 +17,7 @@ USE_REINPLACE= yes USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= cuebreakpoints.1 cueconvert.1 cueprint.1 PORTDOCS= README diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile index ae7619865c3b..25b5708d80c8 100644 --- a/audio/darkice/Makefile +++ b/audio/darkice/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-lame-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} diff --git a/audio/faac/Makefile b/audio/faac/Makefile index 57677145a433..38659e3a9116 100644 --- a/audio/faac/Makefile +++ b/audio/faac/Makefile @@ -24,7 +24,7 @@ AUTOMAKE_ARGS= --add-missing USE_GMAKE= yes USE_LIBTOOL_VER=13 USE_REINPLACE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ HAVECXX="yes" diff --git a/audio/faad/Makefile b/audio/faad/Makefile index 9512d29221ea..ea141b9136db 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -26,7 +26,7 @@ NO_CDROM= "Restrictive copyright (do not sell for profit)" USE_AUTOMAKE_VER= 15 USE_AUTOHEADER_VER= 259 AUTOMAKE_ARGS= --add-missing -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG=yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile index 1ad7a924de00..82fc50b36574 100644 --- a/audio/festival+OGI/Makefile +++ b/audio/festival+OGI/Makefile @@ -33,7 +33,7 @@ DIST_SUBDIR= festival RESTRICTED= no-commercial-use FESTIVAL= ${WRKSRC}/festival -FESTIVAL_ARCH= ${MACHINE_ARCH:S/i386/ix86/} +FESTIVAL_ARCH= ${ARCH:S/i386/ix86/} FHOME= ${PREFIX}/share/festival MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS} \ EST_HOME=${SPEECHTOOLS} \ diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 485dbcfd9b79..48231b6236db 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -26,7 +26,7 @@ DIST_SUBDIR= festival EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aa -FESTIVAL_ARCH= ${MACHINE_ARCH:S/i386/ix86/} +FESTIVAL_ARCH= ${ARCH:S/i386/ix86/} USE_GCC= 2.95 WRKSRC= ${WRKDIR} diff --git a/audio/flac/Makefile b/audio/flac/Makefile index bc592aa61516..041f2aab7cd2 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -16,14 +16,14 @@ COMMENT= Free lossless audio codec LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/libogg -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm .endif USE_ICONV= yes USE_REINPLACE= yes USE_LIBTOOL_VER=15 -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} CONFIGURE_ARGS= --enable-sse \ --with-libiconv-prefix="${LOCALBASE}" \ --with-ogg="${LOCALBASE}" diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile index 7349aec2ddd2..5d04effa71f2 100644 --- a/audio/flac123/Makefile +++ b/audio/flac123/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= FLAC.7:${PORTSDIR}/audio/flac \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PORTDOCS= README.remote PLIST_FILES= bin/flac123 diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 3ace7b36186f..cbdc223f77ca 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lame MAINTAINER= netchild@FreeBSD.org COMMENT= ISO code based fast MP3 encoder kit -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm .endif diff --git a/audio/linux-arts/Makefile b/audio/linux-arts/Makefile index 108d6b92be4d..993aed970ff8 100644 --- a/audio/linux-arts/Makefile +++ b/audio/linux-arts/Makefile @@ -10,9 +10,9 @@ PORTVERSION= 1.0.3 PORTREVISION= 3 CATEGORIES= audio kde linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= 8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= 8.0/en/os/${ARCH}/RedHat/RPMS PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile index e67027ca85ba..469d54630afd 100644 --- a/audio/linux-esound/Makefile +++ b/audio/linux-esound/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of esound RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile -RPM_SET= esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= esound-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/audio/linux-f10-arts/Makefile b/audio/linux-f10-arts/Makefile index 108d6b92be4d..993aed970ff8 100644 --- a/audio/linux-f10-arts/Makefile +++ b/audio/linux-f10-arts/Makefile @@ -10,9 +10,9 @@ PORTVERSION= 1.0.3 PORTREVISION= 3 CATEGORIES= audio kde linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= 8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= 8.0/en/os/${ARCH}/RedHat/RPMS PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile index e67027ca85ba..469d54630afd 100644 --- a/audio/linux-f10-esound/Makefile +++ b/audio/linux-f10-esound/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of esound RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile -RPM_SET= esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= esound-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile index 35d35de5cb40..7516d7d0065e 100644 --- a/audio/linux-f10-libaudiofile/Makefile +++ b/audio/linux-f10-libaudiofile/Makefile @@ -13,6 +13,6 @@ CATEGORIES= audio linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of audiofile -RPM_SET= audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= audiofile-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/audio/linux-f8-arts/Makefile b/audio/linux-f8-arts/Makefile index 108d6b92be4d..993aed970ff8 100644 --- a/audio/linux-f8-arts/Makefile +++ b/audio/linux-f8-arts/Makefile @@ -10,9 +10,9 @@ PORTVERSION= 1.0.3 PORTREVISION= 3 CATEGORIES= audio kde linux MASTER_SITES= ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= 8.0/en/os/${MACHINE_ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= 8.0/en/os/${ARCH}/RedHat/RPMS PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -30,8 +30,8 @@ ONLY_FOR_ARCHS= i386 DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile index e67027ca85ba..469d54630afd 100644 --- a/audio/linux-f8-esound/Makefile +++ b/audio/linux-f8-esound/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of esound RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile -RPM_SET= esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= esound-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile index 35d35de5cb40..7516d7d0065e 100644 --- a/audio/linux-f8-libaudiofile/Makefile +++ b/audio/linux-f8-libaudiofile/Makefile @@ -13,6 +13,6 @@ CATEGORIES= audio linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of audiofile -RPM_SET= audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= audiofile-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile index 35d35de5cb40..7516d7d0065e 100644 --- a/audio/linux-libaudiofile/Makefile +++ b/audio/linux-libaudiofile/Makefile @@ -13,6 +13,6 @@ CATEGORIES= audio linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of audiofile -RPM_SET= audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= audiofile-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile index 64e879d88838..53a19bc10490 100644 --- a/audio/lplayer/Makefile +++ b/audio/lplayer/Makefile @@ -26,7 +26,7 @@ USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-xmms-prefix=${X11BASE} --with-xinerama \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile index 0921b1f2c475..1a884d4463a5 100644 --- a/audio/mbrola/Makefile +++ b/audio/mbrola/Makefile @@ -45,13 +45,13 @@ do-patch: do-install: .if defined(USE_LINUX) -.if (${MACHINE_ARCH} == "alpha") +.if (${ARCH} == "alpha") @${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-alpha ${PREFIX}/bin/mbrola -.elseif (${MACHINE_ARCH} == "i386") +.elseif (${ARCH} == "i386") @${INSTALL_PROGRAM} ${WRKSRC}/mbrola-linux-i386 ${PREFIX}/bin/mbrola -.elseif (${MACHINE_ARCH} == "ppc") +.elseif (${ARCH} == "ppc") @${INSTALL_PROGRAM} ${WRKSRC}/mbrola206a-linux-ppc ${PREFIX}/bin/mbrola -.elseif (${MACHINE_ARCH} == "sparc64") +.elseif (${ARCH} == "sparc64") @${INSTALL_PROGRAM} ${WRKSRC}/mbrola-SuSElinux-ultra1.dat \ ${PREFIX}/bin/mbrola .endif diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile index 7869fe2021eb..c8b17d56ef73 100644 --- a/audio/mp3splt/Makefile +++ b/audio/mp3splt/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ GNU_CONFIGURE= yes CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/audio/mp3wrap/Makefile b/audio/mp3wrap/Makefile index 0a05d24f857c..5c2b0f187303 100644 --- a/audio/mp3wrap/Makefile +++ b/audio/mp3wrap/Makefile @@ -16,7 +16,7 @@ MAINTAINER= q@uni.de COMMENT= Utility to merge mp3 files (and other formats) GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index abda9cc3ac7f..114e015a245e 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -22,7 +22,7 @@ MAN1= mpc.1 .include <bsd.port.pre.mk> -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/audio/mpeg4ip-faad/Makefile b/audio/mpeg4ip-faad/Makefile index f2f3dea23174..0b59430f7314 100644 --- a/audio/mpeg4ip-faad/Makefile +++ b/audio/mpeg4ip-faad/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_AUTOMAKE_VER= 15 USE_AUTOHEADER_VER= 253 AUTOMAKE_ARGS= --add-missing -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG=yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile index 86dd7eabefca..2521f732e21c 100644 --- a/audio/mpg321/Makefile +++ b/audio/mpg321/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \ mad.2:${PORTSDIR}/audio/libmad GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-mpg123-symlink CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile index c7c3f6dcd358..7af40bb03fbb 100644 --- a/audio/normalize/Makefile +++ b/audio/normalize/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .if defined(WITH_XMMS) PLIST_SUB+= XMMS="" diff --git a/audio/openal/Makefile b/audio/openal/Makefile index edfe882d83b8..93f3985dff9e 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -18,7 +18,7 @@ INFO= openal WRKSRC= ${WRKDIR}/${DISTNAME}/linux GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_GNOME= pkgconfig INSTALLS_SHLIB= yes diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile index 221e959511f8..26f1e9b0c854 100644 --- a/audio/osalp/Makefile +++ b/audio/osalp/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_GETOPT_LONG=yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CFLAGS+= -fPIC -DPIC CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/audio/resid/Makefile b/audio/resid/Makefile index e075ce1d685c..f4f6870b9fe0 100644 --- a/audio/resid/Makefile +++ b/audio/resid/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Cycle-based SID emulator engine USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-shared INSTALLS_SHLIB= yes diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile index 606bcf7fe9da..0e1799cd11be 100644 --- a/audio/rioutil/Makefile +++ b/audio/rioutil/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= usb-0.1.7:${PORTSDIR}/devel/libusb USE_GETOPT_LONG= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 6e46e3c0fcb0..d50ff1c026ac 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -21,7 +21,7 @@ USE_SDL= sdl USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" INSTALLS_SHLIB= yes diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile index 96506d499e17..ca12184cfe9b 100644 --- a/audio/sdl_sound/Makefile +++ b/audio/sdl_sound/Makefile @@ -18,7 +18,7 @@ COMMENT= A SDL audio library and player for some popular sound file formats USE_SDL= sdl USE_REINPLACE= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes diff --git a/audio/snack/Makefile b/audio/snack/Makefile index 8c75e9881458..4861e014061c 100644 --- a/audio/snack/Makefile +++ b/audio/snack/Makefile @@ -23,7 +23,7 @@ OPTIONS= VORBIS "Support for OGG/Vorbis Audio" off USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 \ --with-tk=${LOCALBASE}/lib/tk8.4 MAKE_ENV= prefix=${PREFIX} exec_prefix=${PREFIX} diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile index e50b6b5e170e..a5f4f1aaa968 100644 --- a/audio/speex-devel/Makefile +++ b/audio/speex-devel/Makefile @@ -25,7 +25,7 @@ USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_LIBTOOL_VER= 15 LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 098dba1bca08..3c12e5a7ae52 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -26,7 +26,7 @@ USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_INC_LIBTOOL_VER= 13 LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile index 58b4d9db089a..ca9e59c7a9b9 100644 --- a/audio/swhplugins/Makefile +++ b/audio/swhplugins/Makefile @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index 5d25929c7312..e8b19deb8981 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -19,6 +19,6 @@ USE_INC_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile index 54c554241970..fc275cc9fa5a 100644 --- a/audio/tclmidi/Makefile +++ b/audio/tclmidi/Makefile @@ -17,7 +17,7 @@ COMMENT= A language designed for creating and editing standard MIDI files LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 -.if ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" +.if ${ARCH} == "ia64" || ${ARCH} == "sparc64" IGNORE= "ignored due to cast from pointer to integer of different size" .endif diff --git a/audio/umix/Makefile b/audio/umix/Makefile index ee0269bd7da1..6c05da703985 100644 --- a/audio/umix/Makefile +++ b/audio/umix/Makefile @@ -17,7 +17,7 @@ COMMENT= Advanced tool for adjusting soundcard mixers, replacement for aumix USE_GETOPT_LONG= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= umix.1 PLIST_FILES= bin/umix diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile index 8711abceecbc..c242ef9182e9 100644 --- a/audio/vorbisgain/Makefile +++ b/audio/vorbisgain/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis USE_ZIP= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile index 018b3ff2174d..059954b6448f 100644 --- a/audio/xhippo/Makefile +++ b/audio/xhippo/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 USE_GNOME= gtk12 WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= ChangeLog gnu-xhippo.html screenshot.jpeg xhippo.html.gz \ xhippo.info.gz xhippo.ps.gz xhippo.sgml xhippo.txt.gz diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile index 334632e0fcd0..38befb46d08b 100644 --- a/audio/xmms-arts_output/Makefile +++ b/audio/xmms-arts_output/Makefile @@ -22,7 +22,7 @@ USE_X_PREFIX= yes USE_GNOME= gtk12 USE_INC_LIBTOOL_VER= 13 INSTALLS_SHLIB= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= lib/xmms/Output/libarts.so \ bin/xmms-arts-helper diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile index 297d05207cb4..5dbf8a798340 100644 --- a/audio/xmms-faad/Makefile +++ b/audio/xmms-faad/Makefile @@ -33,7 +33,7 @@ USE_GNOME= gtk12 USE_GMAKE= yes USE_REINPLACE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-xmms --with-mp4v2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_GTK" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile index 758ad05318f1..67f89c4d25da 100644 --- a/audio/xmms-kde/Makefile +++ b/audio/xmms-kde/Makefile @@ -23,7 +23,7 @@ USE_INC_LIBTOOL_VER= 13 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} \ --with-xmms-prefix=${X11BASE} USE_GNOME= gtk12 diff --git a/audio/xmms-real-random/Makefile b/audio/xmms-real-random/Makefile index d878ad8b50b7..9adac5a1533f 100644 --- a/audio/xmms-real-random/Makefile +++ b/audio/xmms-real-random/Makefile @@ -23,7 +23,7 @@ USE_LIBTOOL_VER= 13 INSTALLS_SHLIB= yes USE_X_PREFIX= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS='${CFLAGS}' post-patch: diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile index eedf8f7f25b4..3ec1448993ec 100644 --- a/audio/xmms-volnorm/Makefile +++ b/audio/xmms-volnorm/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= lib/xmms/Effect/libnormvol.so USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.mk> diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index 362d0c06fd71..2a610973404f 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -29,7 +29,7 @@ CFLAGS+= -fPIC .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha" +.if ${OSVERSION} > 500013 || ${ARCH} == "alpha" USE_GNOME+= esound CONFIGURE_ARGS+= --disable-oss --enable-esd PKGNAMESUFFIX= -esound diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 5d40ad9021b1..3ad52f96d012 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -38,7 +38,7 @@ MAN1= xsidplay.1 .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" CFLAGS+= -O0 .endif diff --git a/benchmarks/dkftpbench/Makefile b/benchmarks/dkftpbench/Makefile index 57782f91fb6e..d21ebd5ef261 100644 --- a/benchmarks/dkftpbench/Makefile +++ b/benchmarks/dkftpbench/Makefile @@ -16,7 +16,7 @@ COMMENT= A FTP benchmark program PLIST_FILES= bin/dkftpbench GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_AUTOCONF_VER=259 USE_AUTOMAKE_VER=14 diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile index f105aa3f2371..318f907ab3f1 100644 --- a/benchmarks/himenobench/Makefile +++ b/benchmarks/himenobench/Makefile @@ -29,7 +29,7 @@ RESTRICTED= "unsure to redistribute" .if defined(WITH_OPTIMIZED_FLAGS) FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH}== "amd64") +.if (${ARCH} == "i386" && !${ARCH}== "amd64") FFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double .endif # i386 diff --git a/biology/avida/Makefile b/biology/avida/Makefile index 825a3dc3b317..6985cb872843 100644 --- a/biology/avida/Makefile +++ b/biology/avida/Makefile @@ -17,7 +17,7 @@ COMMENT= Avida is an auto-adaptive genetic system designed for ALife research USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-standard-prefix --datadir=${DATADIR} --enable-viewer -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_PERL5_BUILD= yes USE_REINPLACE= yes diff --git a/biology/deft/files/Makefile.deft b/biology/deft/files/Makefile.deft index 18e8684be2e5..7860a06f654a 100644 --- a/biology/deft/files/Makefile.deft +++ b/biology/deft/files/Makefile.deft @@ -4,7 +4,7 @@ TARGET = DeFT.exec FFLAGS += -w -O3 CFLAGS += -w -O3 -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" FFLAGS += -malign-double CFLAGS += -malign-double .endif diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile index 6c24973fcf6e..89784ea2f707 100644 --- a/biology/garlic/Makefile +++ b/biology/garlic/Makefile @@ -26,7 +26,7 @@ ALL_TARGET= # empty .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 .endif # i386 .endif diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile index b6f3ffa28cf5..4f5e3125bf6b 100644 --- a/biology/libgenome/Makefile +++ b/biology/libgenome/Makefile @@ -18,7 +18,7 @@ COMMENT= Toolkit for developing bioinformatic related software in C++ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_REINPLACE= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes post-patch: diff --git a/biology/migrate/Makefile b/biology/migrate/Makefile index a2d2d78e74b2..d012d994a1d2 100644 --- a/biology/migrate/Makefile +++ b/biology/migrate/Makefile @@ -16,7 +16,7 @@ COMMENT= A program to estimate population sizes and migration rates WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes MAN1= migrate.1 diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile index e3131868117a..088e0da8f505 100644 --- a/biology/mopac/Makefile +++ b/biology/mopac/Makefile @@ -35,7 +35,7 @@ MAKE_ARGS+= FC=ftn77 MAKE_ARGS+= FC=f77 .endif MAKE_ARGS+= FFLAGS="${FFLAGS} -w" CFLAGS="${CFLAGS} -I${PREFIX}/include" -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" FFLAGS+= -malign-double .endif diff --git a/biology/platon/Makefile b/biology/platon/Makefile index f22e06fd0246..df07f27b4197 100644 --- a/biology/platon/Makefile +++ b/biology/platon/Makefile @@ -30,7 +30,7 @@ TESTDATADIR= ABSORB_EXAMPLE ABSTOMPA_EXAMPLE ABSTOMPA_TEST ADDSYM_EXAMPLE \ ASYM_EXAMPLE DELABS_EXAMPLE MULABS_EXAMPLE PSICOR_EXAMPLE \ SQUEEZE_EXAMPLE -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" BROKEN= "/usr/libexec/elf/ld: platon.o: .got subsegment exceeds 64K (size 88552)" .endif diff --git a/biology/treepuzzle/Makefile b/biology/treepuzzle/Makefile index f114797909b6..98d0a706d9ec 100644 --- a/biology/treepuzzle/Makefile +++ b/biology/treepuzzle/Makefile @@ -15,7 +15,7 @@ MAINTAINER= jan.lentfer@web.de COMMENT= Maximum likelihood phylogeny reconstruction using quartets GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/puzzle pre-configure: diff --git a/biology/xdrawchem/Makefile b/biology/xdrawchem/Makefile index 0cbd10be3183..4f0b3c460015 100644 --- a/biology/xdrawchem/Makefile +++ b/biology/xdrawchem/Makefile @@ -18,7 +18,7 @@ COMMENT= Chemical drawing program LIB_DEPENDS= openbabel.0:${PORTSDIR}/science/openbabel CFLAGS+= -O0 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes PKGMESSAGE= ${WRKDIR}/pkg-message QTCFGLIBS+= ${PTHREAD_LIBS} diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 5003028699a0..919edab7ded4 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -32,7 +32,7 @@ TRIANGLE_PORTDIR= ${PORTSDIR}/math/triangle USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fltk-prefix=${X11BASE} \ --with-gsl-prefix=${LOCALBASE} \ --with-jpeg-prefix=${LOCALBASE} \ diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 9f1813c3cf85..86f060175e2c 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 USE_GNOME= gtk12 USE_REINPLACE= yes USE_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile index 4f49aa9098da..04f373d1bb55 100644 --- a/cad/qfsm/Makefile +++ b/cad/qfsm/Makefile @@ -19,7 +19,7 @@ USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include post-extract: diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 11fd8086dab7..3a3dea93cd1c 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -21,7 +21,7 @@ USE_GHOSTSCRIPT_RUN= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index a598a48db4a2..fa0bb3ed4486 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -29,7 +29,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile index 97a73d62a9d8..00846572c7d7 100644 --- a/chinese/iiimf-le-ude/Makefile +++ b/chinese/iiimf-le-ude/Makefile @@ -29,7 +29,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif BUILD_WRKSRC= ${WRKSRC}/ude diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile index 15d1c7ac5074..5dc5b1d58d89 100644 --- a/chinese/iiimf-le-xcin/Makefile +++ b/chinese/iiimf-le-xcin/Makefile @@ -27,7 +27,7 @@ USE_AUTOHEADER_VER= 259 AUTOMAKE_ARGS= --add-missing USE_AUTOMAKE_VER= 19 USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} do-extract: ${MKDIR} ${WRKDIR} diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile index 1efef518f5f1..26a671909180 100644 --- a/chinese/xemacs/Makefile +++ b/chinese/xemacs/Makefile @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_XPM= yes STRIP= HAS_CONFIGURE= yes -XEMACS_ARCH= ${MACHINE_ARCH}--freebsd +XEMACS_ARCH= ${ARCH}--freebsd CONFIGURE_ARGS= ${XEMACS_ARCH} --prefix=${PREFIX} \ --with-mule \ --with-xfs \ diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile index eac36adef287..244c75d2bf1c 100644 --- a/comms/lirc/Makefile +++ b/comms/lirc/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-manage-devices --with-devdir=/var/lirc .include <bsd.port.pre.mk> diff --git a/comms/qicosi/Makefile b/comms/qicosi/Makefile index fb972be2a365..18fa3dcbb4a6 100644 --- a/comms/qicosi/Makefile +++ b/comms/qicosi/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-lock-style=open .endif CONFIGURE_ARGS+= --with-config=${CONFDIR}/qico.conf \ --with-default-speed=115200 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= Changes FAQ README EXAMPLES= fts-0001 onchat qhistory qico.xpm qlinks sfreq \ diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index d1d7ab2abd52..c5b52d905d1b 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= scmxx.1 MANLANG= "" ru de it diff --git a/converters/enca/Makefile b/converters/enca/Makefile index db730f987e17..e1e2b08da8c3 100644 --- a/converters/enca/Makefile +++ b/converters/enca/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --without-librecode \ --with-libiconv=${LOCALBASE} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib diff --git a/converters/fix-mime-charset/Makefile b/converters/fix-mime-charset/Makefile index 71679f9e6268..f4651a5b8a4f 100644 --- a/converters/fix-mime-charset/Makefile +++ b/converters/fix-mime-charset/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_GETOPT_LONG= yes USE_PERL5_BUILD= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 7e03df219db7..3a092193c029 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -18,7 +18,7 @@ INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-imagemagick=no -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} MAN1= psiconv.1 psiconv-config.1 diff --git a/converters/shftool/Makefile b/converters/shftool/Makefile index 3462a260bd17..700781e3d528 100644 --- a/converters/shftool/Makefile +++ b/converters/shftool/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: ${REINPLACE_CMD} -e 's,^LIBLOC_LIST=.*,LIBLOC_LIST=${LOCALBASE},' \ diff --git a/converters/tnef/Makefile b/converters/tnef/Makefile index 45dd715650ad..b6e16f465fa5 100644 --- a/converters/tnef/Makefile +++ b/converters/tnef/Makefile @@ -16,7 +16,7 @@ COMMENT= Unpack data in MS Outlook TNEF format GNU_CONFIGURE= yes USE_GETOPT_LONG= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= tnef.1 PORTDOCS= AUTHORS NEWS README THANKS TODO diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/databases/courier-authlib-mysql/Makefile +++ b/databases/courier-authlib-mysql/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/databases/courier-authlib-pgsql/Makefile +++ b/databases/courier-authlib-pgsql/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/databases/courier-authlib-userdb/Makefile +++ b/databases/courier-authlib-userdb/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/databases/courier-authlib-usergdbm/Makefile +++ b/databases/courier-authlib-usergdbm/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/databases/db3/Makefile b/databases/db3/Makefile index 1e189ac6f3f5..66a63c97e59b 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --enable-dynamic \ --prefix=${PREFIX} \ --includedir=${PREFIX}/include/db3 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALL_TARGET= install_include install_lib install_utilities .if !defined(NOPORTDOCS) INSTALL_TARGET+= install_docs docdir=${DOCSDIR} diff --git a/databases/db4/Makefile b/databases/db4/Makefile index fed7092819e9..427d069268b4 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ --enable-cxx --enable-dynamic \ --includedir=${PREFIX}/include/db4 diff --git a/databases/db41/Makefile b/databases/db41/Makefile index 49767b36f05d..b0864665bf9a 100644 --- a/databases/db41/Makefile +++ b/databases/db41/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-compat185 --enable-dump185 \ --enable-cxx --enable-dynamic \ --includedir=${PREFIX}/include/db41 diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile index ea3d5ac9aeaf..f89801d2cbe5 100644 --- a/databases/dbconnect/Makefile +++ b/databases/dbconnect/Makefile @@ -18,7 +18,7 @@ COMMENT= Use C++ object API to allow applications to connect to databases GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOCONF_VER= 259 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes CXXFLAGS+= ${PTHREAD_CFLAGS} -fPIC -DFREEBSD diff --git a/databases/fireprofile/Makefile b/databases/fireprofile/Makefile index 02293275ae6c..b76a3f4d6fa2 100644 --- a/databases/fireprofile/Makefile +++ b/databases/fireprofile/Makefile @@ -29,7 +29,7 @@ WANT_MYSQL_VER= 323 post-install: $(LN) ${PREFIX}/lib/libfireprofile.so ${PREFIX}/lib/libfireprofile.so.0 -.if ${MACHINE_ARCH:L} == amd64 +.if ${ARCH:L} == amd64 CFLAGS+= -fPIC .endif .include <bsd.port.mk> diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index b150bab27b24..122f10341572 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -17,7 +17,7 @@ COMMENT= The GNU database manager USE_GMAKE= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .if defined(WITH_COMPAT) diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile index 05dd6e2953d0..50ae608c469d 100644 --- a/databases/gigabase/Makefile +++ b/databases/gigabase/Makefile @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS?=--prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" INSTALLS_SHLIB= yes diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index 385a1d093608..cb0522d38b06 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -25,7 +25,7 @@ USE_INC_LIBTOOL_VER= 13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} .include <bsd.port.mk> diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile index 385a1d093608..cb0522d38b06 100644 --- a/databases/gnomedb/Makefile +++ b/databases/gnomedb/Makefile @@ -25,7 +25,7 @@ USE_INC_LIBTOOL_VER= 13 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -lintl" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} .include <bsd.port.mk> diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index e854530f2efa..5efae94e6656 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -23,7 +23,7 @@ USE_PYTHON= yes CXXFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV+= LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}" \ LDFLAGS="${PTHREAD_LIBS} -largp -L${LOCALBASE}/lib" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER= 15 diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile index 18da2b219634..619ff12bc63b 100644 --- a/databases/knoda/Makefile +++ b/databases/knoda/Makefile @@ -25,7 +25,7 @@ INSTALLS_SHLIB= yes USE_INC_LIBTOOL_VER= 13 USE_REINPLACE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ARGS+= --build=${ARCH}-portbld-freebsd${OSREL} \ --with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \ --with-hk_classes-incdir=${LOCALBASE}/include/hk_classes diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index 2d79d522a229..967a41795679 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -28,7 +28,7 @@ USE_INC_LIBTOOL_VER= 13 CONFIGURE_ARGS= --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION} post-patch: diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile index 2e1df2a8777d..39eb4034207d 100644 --- a/databases/mysql-navigator/Makefile +++ b/databases/mysql-navigator/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${X11BASE}" MAKE_ENV+= MOC="${MOC}" QTDIR="${X11BASE}" diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index c43f33808ccf..8dd404b6dc43 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 0af62dba291f..6d57034b63e4 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index eb3cb05bfc40..f9c224f7166d 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index a40f9be8d2a7..4ba0f5b35d05 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index a40f9be8d2a7..4ba0f5b35d05 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index a40f9be8d2a7..4ba0f5b35d05 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index a40f9be8d2a7..4ba0f5b35d05 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index a40f9be8d2a7..4ba0f5b35d05 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index a40f9be8d2a7..4ba0f5b35d05 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes USE_RC_SUBR= mysql-server.sh .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ --without-readline \ diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 501cf6d0ebba..fda0e1a848d8 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 501cf6d0ebba..fda0e1a848d8 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile index 41e56068643e..659acd84cb8c 100644 --- a/databases/sqlite2/Makefile +++ b/databases/sqlite2/Makefile @@ -60,7 +60,7 @@ USE_LIBTOOL_VER= 13 GNU_CONFIGURE= YES USE_REINPLACE= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} ALL_TARGET= all #.if defined(WITH_TCL) #ALL_TARGET+= libtclsqlite.la diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 5e887bc8ddba..a0ba5c2e77a5 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -54,7 +54,7 @@ USE_LIBTOOL_VER= 13 GNU_CONFIGURE= YES USE_REINPLACE= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} ALL_TARGET= all INSTALLS_SHLIB= YES diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile index 5e887bc8ddba..a0ba5c2e77a5 100644 --- a/databases/sqlite34/Makefile +++ b/databases/sqlite34/Makefile @@ -54,7 +54,7 @@ USE_LIBTOOL_VER= 13 GNU_CONFIGURE= YES USE_REINPLACE= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} ALL_TARGET= all INSTALLS_SHLIB= YES diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index b41525043f4e..e6661e2b8013 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-python \ --disable-ruby \ --disable-zope -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include "${.CURDIR}/Makefile.common" diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile index d4eef2874089..23fd9f9e11a6 100644 --- a/databases/xbsql/Makefile +++ b/databases/xbsql/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= xbase-2.0.0:${PORTSDIR}/databases/xbase USE_BISON= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_REINPLACE= yes diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index 016e0b9d7cc9..17f0fcb7d387 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -32,7 +32,7 @@ USE_PERL5_RUN= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.pre.mk> diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile index 82443e017f0a..10f98d9bd7a7 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/acinclude MAN1= acinclude.1 diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile index 77af221b4242..833938ba06d1 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 e1065be64c35..ef506860aeb4 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= lib/libargp.a include/argp.h diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile index b8d02a5a2595..02e0e1e3a9f8 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN3= argtable2.3 diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile index 0f1df88a3475..72131479c6e0 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/autoconf INFO= autoconf${BUILD_VERSION} diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile index 14f3c4b72605..3656e96b7c23 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b1e126bc3271..824ee0a20c48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b1e126bc3271..824ee0a20c48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b1e126bc3271..824ee0a20c48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b1e126bc3271..824ee0a20c48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b1e126bc3271..824ee0a20c48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b1e126bc3271..824ee0a20c48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 24561fc8cc1b..32d014e6e156 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INFO= automake${BUILD_VERSION} diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile index 78829c1b3d2e..499093ff20b8 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes post-patch: diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index 24561fc8cc1b..32d014e6e156 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INFO= automake${BUILD_VERSION} diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile index 49d0abdbd66b..0e308ff1d1c8 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 (${MACHINE_ARCH} == "amd64") -MACHINE_ARCH= x86_64 +.if (${ARCH} == "amd64") +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 74114979cda0..ba15ef8bc014 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= MACHINE_ARCH=avr +MAKE_ENV= 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 74114979cda0..ba15ef8bc014 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= MACHINE_ARCH=avr +MAKE_ENV= 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 f446f3647112..c9f65a35948b 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b9e512330f17..6191cda7cf0e 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b9e512330f17..6191cda7cf0e 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 39d5bb440cb3..4150439a787b 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 39d5bb440cb3..4150439a787b 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 39d5bb440cb3..4150439a787b 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 3bb936480ecb..acd471c6e22e 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=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} .include <bsd.port.mk> diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile index c62f7cb72470..0b252682ddce 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes post-patch: diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index 8dae8acbdb14..41b6300e7269 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN1= ccache.1 PLIST_FILES= bin/ccache diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile index 90ec3fcc9efe..2e0c8db03b61 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKEFILE= makefile MAN1= cdialog.1 diff --git a/devel/cook/Makefile b/devel/cook/Makefile index adcf8b8c6922..f0b6d73f75a6 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 816ba9a6a148..c5bbb08d4b12 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= cproto.1 PLIST_FILES= bin/cproto diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile index 8517b8493eea..3c98f48909ac 100644 --- a/devel/cstringbuffer/Makefile +++ b/devel/cstringbuffer/Makefile @@ -19,7 +19,7 @@ MAN3= csb.3 MANCOMPRESSED= no CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${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 bfd524663e42..fe6012a446fe 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 f2b4429be9fc..07389f53c2b5 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 f293c8ac4090..523fbbd6f8c1 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-cxref-cpp ALL_TARGET= programs diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index e07ac7408988..680e2fa1f255 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 0d9b0b8030fb..0ee6edba2512 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 12509537d12e..ff3682179b00 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 ${MACHINE_ARCH:L} == alpha +.if ${ARCH:L} == alpha CONFIGURE_ARGS+= --enable-langs no .endif diff --git a/devel/fam/Makefile b/devel/fam/Makefile index baa69560b01c..5899ba9a88e5 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile index b752228b18c0..b773379e78d4 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 016b3fd6db27..98a166fa4225 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes MAN1= gengetopt.1 diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index 4cf6e8c1f5ac..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 @@ -18,7 +28,7 @@ COMMENT= GNU indent USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --program-prefix=g diff --git a/devel/global/Makefile b/devel/global/Makefile index a8342cdb704c..4d46f3a21979 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 2e6d3f6e249a..d52c0c2e21e4 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 3634e271570c..2db887c2600d 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-install: @${CAT} ${PKGMESSAGE} diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile index 12232e376512..1cdc121c672d 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-install: @${CAT} ${PKGMESSAGE} diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile index 5ec16c0d23a1..c765ce137e3a 100644 --- a/devel/gnustep/Makefile +++ b/devel/gnustep/Makefile @@ -33,10 +33,10 @@ GNUSTEP_BACK_PORT?= x11-toolkits/gnustep-back .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" GNU_ARCH= ix86 .else -GNU_ARCH= ${MACHINE_ARCH} +GNU_ARCH= ${ARCH} .endif SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile index fa835861d946..1225c98b3daa 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 26b0db0f5f83..d628722a6a01 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} ONLY_FOR_ARCHS= i386 diff --git a/devel/gtgt/Makefile b/devel/gtgt/Makefile index fc1aecc3d033..a6600e08fd76 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile index 722223ba7f9a..83cfbc7e7721 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= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true +MAKE_ENV= 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 6eb17bbd6edf..dcf2d82fba6f 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= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true +MAKE_ENV= 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 b2484d5a1083..376596b986d1 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= MACHINE_ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true +MAKE_ENV= ARCH=${RTEMS_ARCH} NO_CPU_CFLAGS=true pre-configure: @(cd ${WRKDIR} ; \ diff --git a/devel/jam/Makefile b/devel/jam/Makefile index e4927c3ac8bf..9662217516e0 100644 --- a/devel/jam/Makefile +++ b/devel/jam/Makefile @@ -32,7 +32,7 @@ pre-patch: s|^ jam| ./jam|g' ${WRKSRC}/Makefile do-install: -.if ${MACHINE_ARCH} == "alpha" +.if ${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 1b3e418e3c49..1b6eae2e3782 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-jthread .include <bsd.port.mk> diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile index 4ce32e6a9c1b..203ae12a74d9 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 58bf1cb7be66..5cf06a301201 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= kc++.1 PLIST_FILES= bin/kc++ diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile index be9aec10050f..29d1b5f27457 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 (${MACHINE_ARCH} == "amd64") +.if (${ARCH} == "amd64") CONFIGURE_ARGS+= --host=x86_64-portbld-freebsd${OSREL} .endif diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile index 40de09c171ee..6b551d2acbdb 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} + --build=${ARCH}-portbld-freebsd${OSREL} USE_KDELIBS_VER= 3 USE_REINPLACE= yes diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile index 3cb64698fa4b..6cdae68c7591 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ARGS+=--build=${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 620a7e512590..6f580dbf6fcb 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes post-patch: diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile index 49aebf8a8945..5c8bbce9f630 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.mk> diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 756962732591..d61eba159a16 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=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} .include <bsd.port.mk> diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile index b1ff59dcab26..a1847d018d85 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 39974868ec9f..47a810e833bb 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 13 USE_BISON= yes diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index a437ddc33ac0..dfa46b7cfa5e 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=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} .include <bsd.port.mk> diff --git a/devel/libpreps-devel/Makefile b/devel/libpreps-devel/Makefile index 65056280b63f..7d8bf7d0ffed 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE} .include <bsd.port.pre.mk> diff --git a/devel/libpreps/Makefile b/devel/libpreps/Makefile index e6544784ed1b..15b1cf963c1a 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 ca403a5c3b39..03ba86111d15 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.pre.mk> .include "files/manpages" diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile index 7f27823e7f59..eb1e12428dab 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes INFO= libtool${BUILD_VERSION} diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile index 1cc18342a509..dd263df16ed9 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes .if ${PORTNAME} == "libtool" diff --git a/devel/libzt/Makefile b/devel/libzt/Makefile index 7b63fd3517b4..0cff383e9d58 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 c6f1a08a5dd0..289c226744aa 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 a310ff14145b..1a43a4f08d39 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.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile index a310ff14145b..1a43a4f08d39 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.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile index f076547bce49..c9b2fc401597 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.${MACHINE_ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile index f076547bce49..c9b2fc401597 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.${MACHINE_ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f10-sdl12/Makefile b/devel/linux-f10-sdl12/Makefile index 28845887cf76..048d9dff50eb 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.${MACHINE_ARCH} +DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${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.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${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 a310ff14145b..1a43a4f08d39 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.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile index f076547bce49..c9b2fc401597 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.${MACHINE_ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile index f076547bce49..c9b2fc401597 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.${MACHINE_ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-f8-sdl12/Makefile b/devel/linux-f8-sdl12/Makefile index 28845887cf76..048d9dff50eb 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.${MACHINE_ARCH} +DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${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.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile index f076547bce49..c9b2fc401597 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.${MACHINE_ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile index f076547bce49..c9b2fc401597 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.${MACHINE_ARCH}.rpm +RPM_SET= libglade-${PORTVERSION}-3.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/devel/linux-sdl12/Makefile b/devel/linux-sdl12/Makefile index 28845887cf76..048d9dff50eb 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.${MACHINE_ARCH} +DISTNAME= ${PORTNAME:U}-${PORTVERSION:S/.1$/-1/}-1.${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.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${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 561f5ef77188..9d5f11589e9f 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/${MACHINE_ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= ${PORTVERSION}/en/os/${ARCH}/RedHat/RPMS DISTFILES= ${RPM_KERNEL_HEADERS} \ ${RPM_GLIBC_DEVEL} \ - 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 \ + 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 \ ${RPM_GDB} \ ${RPM_X_DEVEL} PATCH_SITES= ${MASTER_SITE_REDHAT_LINUX} -PATCH_SITE_SUBDIR= updates/${PORTVERSION}/en/os/${MACHINE_ARCH} +PATCH_SITE_SUBDIR= updates/${PORTVERSION}/en/os/${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.${MACHINE_ARCH} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} .include <bsd.port.pre.mk> -.if (${MACHINE_ARCH} == "i386") +.if (${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 0973c16d1bd2..ce6e58a5ebc9 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/${MACHINE_ARCH}/RedHat/RPMS +MASTER_SITE_SUBDIR= ${PORTVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS DISTFILES= ${RPM_MAKE} \ - binutils-2.10.91.0.2-3.${MACHINE_ARCH}.rpm \ + binutils-2.10.91.0.2-3.${ARCH}.rpm \ ${RPM_GDB} EXTRACT_ONLY= PATCH_SITES= ${MASTER_SITE_REDHAT_LINUX} -PATCH_SITE_SUBDIR= updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH} +PATCH_SITE_SUBDIR= updates/${PORTVERSION}/${LANG}/os/${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.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} # Let's avoid hardcoding 'en' as the language. LANG= en .include <bsd.port.pre.mk> -.if (${MACHINE_ARCH} == "alpha") +.if (${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 (${MACHINE_ARCH} == "i386") +.if (${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 (${MACHINE_ARCH} == "i386") +.if (${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 0d9d81d28a06..a0d04cf4d732 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.mk> diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile index b349e2d40293..0686c4d309e0 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 bf72e6b42532..a7d261111113 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 3ebaa263ae8e..a697da9524df 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 cedb6fb14938..70f7c4dfa809 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> diff --git a/devel/m17n-db/Makefile b/devel/m17n-db/Makefile index bed0196b8d78..510512996318 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 b085c2da1b4c..aede62bbc5a1 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 4b77d8b9ac07..2250258bd908 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN1= mm-config.1 MAN3= mm.3 diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 5ab8e984459b..cc873547c165 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 2d70267c09b9..fa132c45e9da 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 b86f1fb13d56..5db04f405560 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=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} MAN1= oafd.1 diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile index 045cbba81b9f..a47f1d4cffeb 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 520bb9f3b863..89918dc25f48 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 e44f4e4b6498..4c6ddfa264e3 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.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${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 1b04c2afda4a..132d6171cf51 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 c4f65c82366d..7db31ea60c6b 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= \ .endif CONFIGURE_TARGET= \ - --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} + --build=${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 c896e62bc6cf..6c7b7f9e4b76 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=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message post-build: diff --git a/devel/phptags/Makefile b/devel/phptags/Makefile index 6e23cd4775d4..a99d3f57d94b 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= phptags.1 PLIST_FILES= bin/phptags \ diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 4e9b892f2a75..266c1ab497d7 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -38,7 +38,7 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 0604553372aa..acd1d68f0d53 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 INSTALLS_SHLIB= yes diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile index bf036e441a0e..6332280a368c 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 e6544784ed1b..15b1cf963c1a 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 8a85cfcc14b7..914444bd90be 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e \ diff --git a/devel/pth/Makefile b/devel/pth/Makefile index 7f3a9451627c..3a9f667ee0ef 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 b8db78424495..79910c9d0e75 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 1a0000c1e9b6..fed6139b61c4 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= AWK="${AWK}" MAN1= ragel.1 diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile index bca5eb2cd61f..88e922ee436e 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 3afb73221e24..89f3de680f6e 100644 --- a/devel/ruby-gnustep/Makefile +++ b/devel/ruby-gnustep/Makefile @@ -59,10 +59,10 @@ COMBOLIBDIR= ${SYSLIBDIR} MAKE_ENV+= GNUSTEP_FLATTENED=yes .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" GNU_ARCH= ix86 .else -GNU_ARCH= ${MACHINE_ARCH} +GNU_ARCH= ${ARCH} .endif MAKEFILE= GNUmakefile diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index db472b0cd0f3..c198bb13ce5f 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 cc25ec891861..9f0662ca21ac 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 1afad1decb4a..f29eaa67883c 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 7f2ab2642895..1e8a5537ec32 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 7c408674df67..1e7b8bae1020 100644 --- a/devel/splint/Makefile +++ b/devel/splint/Makefile @@ -18,7 +18,8 @@ COMMENT= A tool for statically checking sourcecode for security vulnerabilities USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +USE_GMAKE= yes MAN1= splint.1 diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile index 1b13ada96bf1..a9156a841e87 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 1b13ada96bf1..a9156a841e87 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 1b13ada96bf1..a9156a841e87 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 1b13ada96bf1..a9156a841e87 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${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 8f346c859a81..f6edbf9842a5 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index b50001940270..da28f73720d0 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${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 577babbf6580..10cdbfbd3eab 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=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.mk> diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile index 4576bd595125..8863ca3003a8 100644 --- a/dns/dnrd/Makefile +++ b/dns/dnrd/Makefile @@ -18,7 +18,7 @@ USE_GMAKE= yes USE_REINPLACE= yes USE_RC_SUBR= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} .if defined(WITH_TCP) diff --git a/dns/nsd/Makefile b/dns/nsd/Makefile index ee191c80b20a..4ff12f8d9fb3 100644 --- a/dns/nsd/Makefile +++ b/dns/nsd/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-user=${NSDUSER} \ --with-pidfile=/var/run/nsd.pid \ --with-dbfile=${NSDDBFILE} \ --with-libwrap -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} SED_SCRIPT= -e 's,%%NSDUSER%%,${NSDUSER},g' \ -e 's,%%NSDDIR%%,${NSDDIR},g' \ diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile index bcd290a24dbf..1ff4a42fe287 100644 --- a/dns/posadis/Makefile +++ b/dns/posadis/Makefile @@ -21,7 +21,7 @@ USE_AUTOCONF_VER= 259 USE_LIBTOOL_VER= 15 USE_LIBLTDL= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so) diff --git a/dns/updatedd/Makefile b/dns/updatedd/Makefile index b2b1ff2d1288..fd2eef31fa41 100644 --- a/dns/updatedd/Makefile +++ b/dns/updatedd/Makefile @@ -18,7 +18,7 @@ COMMENT= Dynamic DNS Update Client supporting multiple services USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} LIBDIR= ${PREFIX}/lib/${PORTNAME} diff --git a/editors/MathPlanner/Makefile b/editors/MathPlanner/Makefile index 4d2b4e6614be..d7bc6551b23e 100644 --- a/editors/MathPlanner/Makefile +++ b/editors/MathPlanner/Makefile @@ -19,7 +19,7 @@ COMMENT= A mathematical design and publishing application USE_QT_VER= 3 USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${QT_PREFIX}" QTCPPFLAGS+= ${PTHREAD_CFLAGS} diff --git a/editors/aewan/Makefile b/editors/aewan/Makefile index 17a960af8d0c..f057172565d2 100644 --- a/editors/aewan/Makefile +++ b/editors/aewan/Makefile @@ -16,7 +16,7 @@ COMMENT= Curses-based program for the creation and editing of ascii art USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= aecat.1 aewan.1 MAN5= aewan.5 diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index a2bf9908790e..729eb34cc198 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -20,7 +20,7 @@ USE_GETTEXT= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 83d93917cca0..ba1f17b9ac9f 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -34,7 +34,7 @@ PATCH_DIST_STRIP= -p1 USE_AUTOCONF_VER=213 USE_GMAKE= yes -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x=no .endif diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile index aac853660cc5..fea7005f4f47 100644 --- a/editors/emacs19/Makefile +++ b/editors/emacs19/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386 DEPRECATED= "editors/emacs is recommended instead for new installations" EMACS_VERSION= 19.34 -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd PLIST_SUB= EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET} NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/emacs-19.34 diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile index 14fadfa3e1da..af2ab9a24ab7 100644 --- a/editors/emacs20-dl/Makefile +++ b/editors/emacs20-dl/Makefile @@ -34,7 +34,7 @@ USE_AUTOCONF_VER= 213 USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EMACS_VER= 20.7 -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile index e1cd200ab06f..b6328d400252 100644 --- a/editors/emacs20-mule-devel/Makefile +++ b/editors/emacs20-mule-devel/Makefile @@ -35,7 +35,7 @@ USE_AUTOCONF_VER= 213 USE_GMAKE= yes MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" EMACS_VER= 20.7 -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if !defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 03c3f0fa35ec..0d100e55ded8 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -27,7 +27,7 @@ USE_AUTOCONF_VER=213 USE_GMAKE= yes EMACS_VER= 20.7 LATEST_LINK?= ${PKGNAMEPREFIX}emacs20 -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x=no --with-pop .else diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index 83d93917cca0..ba1f17b9ac9f 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -34,7 +34,7 @@ PATCH_DIST_STRIP= -p1 USE_AUTOCONF_VER=213 USE_GMAKE= yes -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x=no .endif diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 83d93917cca0..ba1f17b9ac9f 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -34,7 +34,7 @@ PATCH_DIST_STRIP= -p1 USE_AUTOCONF_VER=213 USE_GMAKE= yes -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if defined(WITHOUT_X11) CONFIGURE_ARGS= --with-x=no .endif diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile index c8884e186bbd..af6e0486ce53 100644 --- a/editors/hexcurse/Makefile +++ b/editors/hexcurse/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A versatile ncurses-based hex editor GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= hexcurse.1 PLIST_FILES= bin/hexcurse diff --git a/editors/hte/Makefile b/editors/hte/Makefile index f2305f7f4709..5118883579e4 100644 --- a/editors/hte/Makefile +++ b/editors/hte/Makefile @@ -19,7 +19,7 @@ COMMENT= A file editor/viewer/analyzer for executables USE_BZIP2= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-release diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile index 59da314df948..dbc8dc4d391c 100644 --- a/editors/joe-devel/Makefile +++ b/editors/joe-devel/Makefile @@ -21,7 +21,7 @@ CONFLICTS= joe-2.* LATEST_LINK= joe-devel GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -liconv" diff --git a/editors/lfhex/Makefile b/editors/lfhex/Makefile index 647f859056bb..cf5117bdb30f 100644 --- a/editors/lfhex/Makefile +++ b/editors/lfhex/Makefile @@ -19,7 +19,7 @@ USE_BISON= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= QTDIR="${QT_PREFIX}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-qt-moc=${MOC} MAKE_ARGS= CXXFLAGS="${CXXFLAGS}" \ diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 9d89139c2c7d..f31f07e3a90e 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -25,7 +25,7 @@ USE_GETTEXT= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config diff --git a/editors/ssed/Makefile b/editors/ssed/Makefile index 230e413f77c7..cc211d1848dc 100644 --- a/editors/ssed/Makefile +++ b/editors/ssed/Makefile @@ -17,7 +17,7 @@ COMMENT= Super-sed - a heavily enhanced version of sed WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --program-prefix=s MAN1= ssed.1 diff --git a/editors/ted/Makefile b/editors/ted/Makefile index b39283c41eef..bd44d5a43089 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -26,7 +26,7 @@ USE_MOTIF= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" MAKE_ENV= DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \ DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}\\\"\"" \ diff --git a/editors/tetradraw/Makefile b/editors/tetradraw/Makefile index d4e444f5c2b2..9b50afeccbe1 100644 --- a/editors/tetradraw/Makefile +++ b/editors/tetradraw/Makefile @@ -18,7 +18,7 @@ COMMENT= Fully featured ANSI art editor/viewer with TCP/IP multidraw support USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e \ diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index 8d57d1cb92e4..6a9813595ed1 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -45,7 +45,7 @@ USE_XPM= yes XEMACS_REL= 21.5 XEMACS_VER= ${XEMACS_REL}-b20 -XEMACS_ARCH= ${MACHINE_ARCH}--freebsd +XEMACS_ARCH= ${ARCH}--freebsd WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} STRIP= diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 770b52cd39e8..d8e786353a90 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -38,7 +38,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET} WRKSRC= ${WRKDIR}/xemacs-${XEMACS_VER:S/-b/./} STRIP= USE_AUTOCONF_VER=213 -CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET=${ARCH}--freebsd CONFIGURE_ARGS?=--with-clash-detection \ --with-sound=native,nonas,noesd \ diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index c53cb5105469..0d48bcd4672f 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDI USE_BZIP2= yes STRIP= USE_AUTOCONF_VER=213 -CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET=${ARCH}--freebsd CONFIGURE_ARGS?=--with-clash-detection \ --with-sound=native,nonas,noesd \ diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 98cae6376807..dab6547c2a89 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -48,7 +48,7 @@ USE_XLIB= yes USE_XPM= yes STRIP= USE_AUTOCONF_VER= 213 -CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET=${ARCH}--freebsd CONFIGURE_ARGS= --with-x11 \ --with-mule \ diff --git a/editors/zile/Makefile b/editors/zile/Makefile index dfac99fe4e73..98da9c20de9c 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -19,7 +19,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOMAKE_VER= 19 USE_AUTOCONF_VER= 259 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= zile.1 INFO= zile diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index 6a47a2e4c637..a6c5ebc4433f 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= atari800.1 diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index c76123efe061..33218a950af2 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-split-hd \ --enable-all-optimizations \ --with-x11 \ diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile index 4476c4f23f3a..1265f8023088 100644 --- a/emulators/generator/Makefile +++ b/emulators/generator/Makefile @@ -22,7 +22,7 @@ USE_SDL= sdl USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-gtk diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile index cfa31d4ec237..7acab72474a5 100644 --- a/emulators/hatari/Makefile +++ b/emulators/hatari/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Atari ST emulator GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_SDL= yes diff --git a/emulators/kmamerun/Makefile b/emulators/kmamerun/Makefile index 1c6084e286c1..36b34b50521f 100644 --- a/emulators/kmamerun/Makefile +++ b/emulators/kmamerun/Makefile @@ -19,6 +19,6 @@ RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame USE_KDELIBS_VER=3 GNU_CONFIGURE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile index a6ae7f8a1742..386141aec64a 100644 --- a/emulators/linux_base-suse-9.1/Makefile +++ b/emulators/linux_base-suse-9.1/Makefile @@ -39,6 +39,7 @@ DISTFILES= suse-release-9.1-0.i586.rpm \ libgcc-3.3.3-41.i586.rpm \ termcap-2.0.8-876.i586.rpm \ freetype2-2.1.7-53.i586.rpm +EXTRACT_ONLY= MAINTAINER= trevor@FreeBSD.org COMMENT= Basic packages for Linux mode from SUSE 9.1/i386 @@ -51,7 +52,7 @@ CONFLICTS= linux_base-6* linux_base-7* linux_base-debian* \ NO_LATEST_LINK= yes RESTRICTED= "binaries under GNU GPL without accompanying source" ONLY_FOR_ARCHS= i386 -DIST_SUBDIR= rpm/${MACHINE_ARCH}/suse +DIST_SUBDIR= rpm/${ARCH}/suse PREFIX= ${LINUXBASE} NO_BUILD= yes NO_FILTER_SHLIBS= yes @@ -81,7 +82,7 @@ FALLBACK_ELF_MIB= kern.fallback_elf_brand LINUX_ELF= 3 PREVIOUS_ELF!= /sbin/sysctl -n ${FALLBACK_ELF_MIB} -do-extract: +pre-install: # # Handle the loading of the linux loadable kernel module if required. @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -112,7 +113,7 @@ do-extract: # mtab in etc, albeit an empty one. This is needed in a couple of # cases. Most notably staroffice6. # - ${INSTALL} ${COPY} -m 644 ${FILESDIR}/yp.conf ${WRKSRC}/etc + ${INSTALL_DATA} ${FILESDIR}/yp.conf ${WRKSRC}/etc ${TOUCH} ${WRKSRC}/etc/mtab ${WRKSRC}/etc/host.conf # # Finish @@ -125,7 +126,6 @@ do-extract: done @${LN} -sf /var/tmp ${WRKSRC}/usr/tmp -pre-install: ${RM} -f ${PLIST} cd ${WRKSRC} && ${FIND} -s . -type f -o -type l | \ ${CUT} -c3-999 >> ${PLIST} \ diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile index 4e85deb336f9..d893ddb03b8b 100644 --- a/emulators/pearpc/Makefile +++ b/emulators/pearpc/Makefile @@ -17,7 +17,7 @@ COMMENT= PowerPC emulator USE_XLIB= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message MAN1= ppc.1 diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index c9ac5f7b7bdb..81be44a46e8a 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} USE_X_PREFIX= YES USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= INCLUDES="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDLIBS="-L${X11BASE}/lib ${PTHREAD_LIBS}" \ OPTIMISE="${CXXFLAGS}" diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index e8a042738ba1..112eae21dad5 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -25,7 +25,7 @@ USE_XLIB= yes USE_REINPLACE= yes USE_AUTOCONF_VER= 213 GNU_CONFIGURE= yes -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" CONFIGURE_ARGS+=--disable-intp .endif USE_GMAKE= yes diff --git a/emulators/xbraitenberg/Makefile b/emulators/xbraitenberg/Makefile index 06dd79ca6176..6c5942238441 100644 --- a/emulators/xbraitenberg/Makefile +++ b/emulators/xbraitenberg/Makefile @@ -15,7 +15,7 @@ COMMENT= A Braitenberg vehicle simulator with pseudo-physics USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index e5355f4fb097..6ff04da6cf49 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -31,7 +31,7 @@ USE_GL= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yyes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= ALL diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile index 1e1d7d196c07..d0f3a5ffbfd9 100644 --- a/finance/khacc/Makefile +++ b/finance/khacc/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes WANT_AUTOMAKE_VER= 19 WANT_AUTOCONF_VER= 259 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-qhacc-config=${X11BASE}/bin MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile index cc6b660362a4..47035c7dd9ae 100644 --- a/finance/ktoblzcheck/Makefile +++ b/finance/ktoblzcheck/Makefile @@ -21,7 +21,7 @@ EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIBS= yes MAN1= ktoblzcheck.1 diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index be361e31add7..adaff592d32b 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -21,7 +21,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \ --with-qt-libs=${QT_PREFIX}/lib MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile index 4dfc4dbe336c..cd6170d22941 100644 --- a/finance/quantlib/Makefile +++ b/finance/quantlib/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/QuantLib-${PORTVERSION} USE_GCC= 3.3 USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" INSTALLS_SHLIB= yes diff --git a/french/med/Makefile b/french/med/Makefile index 7d414b26e9f8..156d389cc2f1 100644 --- a/french/med/Makefile +++ b/french/med/Makefile @@ -21,7 +21,7 @@ TK_VER?= 8.4 SHORT_TK_VER= ${TK_VER:S/.//} #CONFIGURE_ARGS= --disable-shared -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" USE_LIBTOOL_VER= 15 diff --git a/ftp/frox/Makefile b/ftp/frox/Makefile index 410d059ff8a7..850fa89b4f9e 100644 --- a/ftp/frox/Makefile +++ b/ftp/frox/Makefile @@ -19,7 +19,7 @@ COMMENT= Transparent FTP proxy with caching support USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_RC_SUBR= yes RC_DIR?= ${PREFIX}/etc/rc.d diff --git a/ftp/muddleftpd/Makefile b/ftp/muddleftpd/Makefile index 8dd6b0c3a637..7da0328f8251 100644 --- a/ftp/muddleftpd/Makefile +++ b/ftp/muddleftpd/Makefile @@ -18,7 +18,7 @@ COMMENT= A new ftp server that can perform a variety of ftp tasks USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-authsmb MAN1= ftpwho.1 muddleftpd.1 mudpasswd.1 diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile index 75e14a639d7d..badb67aa9cb1 100644 --- a/ftp/ocaml-ocurl/Makefile +++ b/ftp/ocaml-ocurl/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-findlib" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} PKGDEINSTALL= ${PKGINSTALL} FINDLIB_PKGNAME=${PORTNAME:S/o//} diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile index e29782eb2fed..2dc33a2e6149 100644 --- a/ftp/oftpd/Makefile +++ b/ftp/oftpd/Makefile @@ -16,7 +16,7 @@ COMMENT= A threaded, anonymous only FTP server designed for security USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN8= oftpd.8 PORTDOCS= README AUTHORS ChangeLog NEWS TODO BUGS diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile index 600947491ccb..9aafbe64e7b9 100644 --- a/ftp/quftp/Makefile +++ b/ftp/quftp/Makefile @@ -22,7 +22,7 @@ USE_REINPLACE= yes CFLAGS+= ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV= CFLAGS="${CFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= quftp.1 PLIST_FILES= bin/quftp diff --git a/ftp/wgetpro/Makefile b/ftp/wgetpro/Makefile index a36ab7dd9c16..2ec8b1a1f642 100644 --- a/ftp/wgetpro/Makefile +++ b/ftp/wgetpro/Makefile @@ -21,7 +21,7 @@ USE_GETOPT_LONG= yes USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .if defined(WITHOUT_NLS) diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile index 85382b770ca5..0ca7d1fdc7f3 100644 --- a/ftp/wput/Makefile +++ b/ftp/wput/Makefile @@ -22,7 +22,7 @@ USE_GETOPT_LONG= yes WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LIBS="${LDFLAGS}" PLIST_FILES= bin/wput diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 89cf537106ca..224178b492d8 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes INSTALLS_SHLIB= yes USE_INC_LIBTOOL_VER=13 CONFIGURE_ARGS+= --without-pam -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS= UTF8 "Enable UTF8 support" off \ diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile index 2689ab664545..ae7980587f86 100644 --- a/ftp/yafc/Makefile +++ b/ftp/yafc/Makefile @@ -17,7 +17,7 @@ COMMENT= Yet another ftp client. Similar to ftp(1) USE_BZIP2= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-socks4=no --with-socks5=no --with-krb4=no \ --with-krb5=no --with-gssapi=no diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile index 118236a99210..2f0728e851a7 100644 --- a/games/abuse_sdl/Makefile +++ b/games/abuse_sdl/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN6= abuse-sdl.6 diff --git a/games/adonthell/Makefile b/games/adonthell/Makefile index 7745fbf24a3b..935fc2c66edb 100644 --- a/games/adonthell/Makefile +++ b/games/adonthell/Makefile @@ -25,7 +25,7 @@ USE_PYTHON= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-py-debug -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile index 73f6ec897259..049d38932739 100644 --- a/games/afternoonstalker/Makefile +++ b/games/afternoonstalker/Makefile @@ -20,7 +20,7 @@ USE_SDL= mixer sdl USE_GETOPT_LONG= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN6= afternoonstalker.6 diff --git a/games/amy/Makefile b/games/amy/Makefile index 5f9c79542efb..b71ac3d03fa7 100644 --- a/games/amy/Makefile +++ b/games/amy/Makefile @@ -22,7 +22,7 @@ NOT_FOR_ARCHS= sparc64 alpha MAN6= Amy.6 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} post-extract: ${BZCAT} ${DISTDIR}/ClassicGames.pgn.bz2 > \ diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile index 5428e45b7423..d7382d466f44 100644 --- a/games/briquolo/Makefile +++ b/games/briquolo/Makefile @@ -21,7 +21,7 @@ USE_GCC= 3.4 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile index 345f2139a048..236bf5f41883 100644 --- a/games/cgoban/Makefile +++ b/games/cgoban/Makefile @@ -19,7 +19,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_AUTOCONF_VER= 253 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/games/crafty/Makefile b/games/crafty/Makefile index 2cd07e921b51..2662eaedd33c 100644 --- a/games/crafty/Makefile +++ b/games/crafty/Makefile @@ -25,11 +25,11 @@ DISTFILES+= ${DOCFILES:S/$/:doc/} ALL_TARGET= crafty OPT= -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" MAKE_ENV+= asm=X86-elf.o OPT+= -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST # XXX Someone with ASM knowledge would have to fix the Sparc.S -.elif ${MACHINE_ARCH} == "sparc64" && defined(CRAFTY_SPARC_ASM) +.elif ${ARCH} == "sparc64" && defined(CRAFTY_SPARC_ASM) MAKE_ENV+= asm=Sparc.o OPT+= -DUSE_ASSEMBLY_A .else diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile index 164762994003..e752a9e9c008 100644 --- a/games/criticalmass/Makefile +++ b/games/criticalmass/Makefile @@ -23,7 +23,7 @@ USE_SDL= image mixer sdl USE_GL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-optimize MAN6= critter.6 diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index 5e4cac2f0b07..187e48367b9c 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -28,7 +28,7 @@ USE_OPENSSL= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN6= crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \ diff --git a/games/d2x/Makefile b/games/d2x/Makefile index 322ecf7ae6e2..dc1ec9e6f2ef 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Unix port of Descent 2 Game GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_SDL= sdl image USE_GMAKE= yes diff --git a/games/deng/Makefile b/games/deng/Makefile index 58f25b98b390..6787195f1c26 100644 --- a/games/deng/Makefile +++ b/games/deng/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity USE_REINPLACE= yes REINPLACE_ARGS= -i "" USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS="${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" \ CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include -I${X11BASE}/include" USE_SDL= sdl mixer net diff --git a/games/exult/Makefile b/games/exult/Makefile index ba86eb66dd5e..f129f5096352 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -22,7 +22,7 @@ USE_SDL= sdl mixer USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1 MAN6= exult.6 diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile index d47dbc006f97..8c0e4e7a3859 100644 --- a/games/freecell-solver/Makefile +++ b/games/freecell-solver/Makefile @@ -17,7 +17,7 @@ COMMENT= A program that automatically solves games of Freecell USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes MAN6= fc-solve-board_gen.6 fc-solve.6 \ diff --git a/games/fuhquake/files/Makefile b/games/fuhquake/files/Makefile index bb65bf3408c8..589bfc987e0f 100644 --- a/games/fuhquake/files/Makefile +++ b/games/fuhquake/files/Makefile @@ -18,7 +18,7 @@ DO_CFLAGS += -DNO_WINDOWED_MOUSE .undef WITHOUT_X86_ASM .endif -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) DO_CFLAGS += -Did386 .endif @@ -116,7 +116,7 @@ CL_COMMON_OBJS = \ rulesets.o \ utils.o -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) CL_COMMON_AS_OBJS = \ cl_math.o \ math.o \ @@ -154,7 +154,7 @@ CL_SOFT_OBJS = \ r_surf.o \ r_vars.o -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) CL_SOFT_AS_OBJS = \ d_draw.o \ d_draw16.o \ @@ -192,7 +192,7 @@ CL_GLX_OBJS = \ CL_SVGA_OBJS = vid_svgalib.o -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) CL_SVGA_AS_OBJS = d_copy.o .endif diff --git a/games/glob2/Makefile b/games/glob2/Makefile index ff17a7fdcc30..9c635668be34 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ USE_SDL= image net sdl GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" USE_GCC= 3.4 diff --git a/games/gltron/Makefile b/games/gltron/Makefile index c7a6ea40fc96..ad620bed037a 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -24,7 +24,7 @@ USE_SDL= sdl sound USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-warn diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile index 2e9f94d53bea..acb7a2d52534 100644 --- a/games/gnuchess/Makefile +++ b/games/gnuchess/Makefile @@ -38,7 +38,7 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" post-patch: diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 2c57a7c1b5ed..60e28d9e0301 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -21,7 +21,7 @@ USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" INSTALLS_OMF= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} DOCS= AUTHORS COPYING NEWS ChangeLog TODO README INSTALL diff --git a/games/heroes/Makefile b/games/heroes/Makefile index c9583ab6132e..a5ae265c3044 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -37,7 +37,7 @@ USE_GETOPT_LONG= yes USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi diff --git a/games/ifm/Makefile b/games/ifm/Makefile index bf5163298ab1..13b1cd94b4cb 100644 --- a/games/ifm/Makefile +++ b/games/ifm/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.4 post-patch: diff --git a/games/jfk/Makefile b/games/jfk/Makefile index 6f07fe0ae593..aa2a6fba448a 100644 --- a/games/jfk/Makefile +++ b/games/jfk/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://relax.ath.cx/jfk/ MAINTAINER= stefan@fafoe.narf.at COMMENT= A multiplayer 2D shoot'em up game -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes USE_SDL= image sdl diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile index 3f588d1bec67..f91bfb68f6f0 100644 --- a/games/kpicframer/Makefile +++ b/games/kpicframer/Makefile @@ -19,7 +19,7 @@ USE_KDELIBS_VER= 3 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} pre-build: ${TOUCH} ${WRKSRC}/config.h.in diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile index b540e234f32f..f9b2f1253f4e 100644 --- a/games/kpictorial/Makefile +++ b/games/kpictorial/Makefile @@ -17,7 +17,7 @@ COMMENT= Little logical game for KDE USE_KDELIBS_VER= 3 GNU_CONFIGURE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_REINPLACE= yes diff --git a/games/lincity/Makefile b/games/lincity/Makefile index a25a6c304d0c..8da7b9c265a0 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -17,7 +17,7 @@ COMMENT= Rich city simulation game for X USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile index 7764a58e25a0..cc545d01a190 100644 --- a/games/maelstrom/Makefile +++ b/games/maelstrom/Makefile @@ -19,7 +19,7 @@ USE_X_PREFIX= yes USE_SDL= sdl net USE_XPM= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(NOPORTDOCS) INSTALL_TARGET= install install_gamedocs diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile index 5420ff07131d..0cbbfadce3e8 100644 --- a/games/mvdsv/Makefile +++ b/games/mvdsv/Makefile @@ -45,7 +45,7 @@ pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options" .endif -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) @${ECHO_MSG} "Define WITHOUT_X86_ASM to disable x86 assembly code" .endif diff --git a/games/mvdsv/files/Makefile b/games/mvdsv/files/Makefile index bc1f37e86d85..74b6d442bbef 100644 --- a/games/mvdsv/files/Makefile +++ b/games/mvdsv/files/Makefile @@ -13,7 +13,7 @@ DO_CFLAGS = ${CFLAGS} -funsigned-char -I${LOCALBASE}/include -DSERVERONLY -Dstricmp=strcasecmp -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) DO_CFLAGS += -Did386 .endif @@ -64,7 +64,7 @@ SV_OBJS = \ world.o \ zone.o -.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM) +.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM) SV_AS_OBJS = \ math.o \ sys_x86.o \ diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile index 1f3d05106636..8b17bc2032ba 100644 --- a/games/openmortal/Makefile +++ b/games/openmortal/Makefile @@ -22,7 +22,7 @@ USE_REINPLACE= yes USE_SDL= mixer image sdl net GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" post-patch: diff --git a/games/pinball/Makefile b/games/pinball/Makefile index 01e4383f852c..da1ec465e188 100644 --- a/games/pinball/Makefile +++ b/games/pinball/Makefile @@ -30,7 +30,7 @@ USE_GL= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug .if defined(WITH_ALLEGRO) CONFIGURE_ARGS+= --with-allegro @@ -45,9 +45,9 @@ DOCS= README .include <bsd.port.pre.mk> post-install: - @${MV} ${PREFIX}/bin/${MACHINE_ARCH}-unknown-freebsd${OSREL}-pinball \ + @${MV} ${PREFIX}/bin/${ARCH}-unknown-freebsd${OSREL}-pinball \ ${PREFIX}/bin/pinball - @${MV} ${PREFIX}/bin/${MACHINE_ARCH}-unknown-freebsd${OSREL}-pinball-config \ + @${MV} ${PREFIX}/bin/${ARCH}-unknown-freebsd${OSREL}-pinball-config \ ${PREFIX}/bin/pinball-config .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/games/qgo/Makefile b/games/qgo/Makefile index e594a6d9ef44..79fcbe363658 100644 --- a/games/qgo/Makefile +++ b/games/qgo/Makefile @@ -19,7 +19,7 @@ USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index 06466a1c63be..02c815a90881 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -26,7 +26,7 @@ WANT_SDL= yes .include <bsd.port.pre.mk> CONFIGURE_ARGS= --program-transform-name='s/^quake2$$/q2f/' -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} .if ${HAVE_SDL:Msdl}!="" WITH_SDL= yes diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index c25828a2c3b6..8eb77d7eb2ba 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -43,7 +43,7 @@ WANT_SDL= yes BROKEN= "Does not compile on sparc64" .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--with-global-cfg=${PREFIX}/etc/quakeforge.conf \ --with-sharepath=${PREFIX}/share/quakeforge \ --disable-optimize diff --git a/games/ssc/Makefile b/games/ssc/Makefile index 6614361476c0..9aa84637f7bb 100644 --- a/games/ssc/Makefile +++ b/games/ssc/Makefile @@ -24,7 +24,7 @@ USE_GL= yes USE_SDL= mixer sdl USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${X11BASE}/include" \ LDFLAGS=-L${X11BASE}/lib ONLY_FOR_ARCHS= i386 diff --git a/games/supertux/Makefile b/games/supertux/Makefile index 6b37291a7359..1464f158c64e 100644 --- a/games/supertux/Makefile +++ b/games/supertux/Makefile @@ -20,7 +20,7 @@ USE_SDL= image mixer USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug USE_REINPLACE= yes diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 72e6175cbd46..0f3898c3f3e9 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -30,7 +30,7 @@ USE_REINPLACE= yes USE_GETOPT_LONG=yes REINPLACE_ARGS= -i "" CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} ALL_TARGET= default LDFLAGS+= -L${LOCALBASE}/lib diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile index 47620fd43478..3969e94dc64c 100644 --- a/games/trackballs/Makefile +++ b/games/trackballs/Makefile @@ -23,7 +23,7 @@ USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN6= ${PORTNAME}.6 diff --git a/games/vamos/Makefile b/games/vamos/Makefile index 24873eec6855..bb5e7a06f6e3 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -25,7 +25,7 @@ USE_GL= yes USE_GETOPT_LONG= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile index 607a9b8e244e..f97b3cc8bf81 100644 --- a/games/wmpuzzle/Makefile +++ b/games/wmpuzzle/Makefile @@ -21,7 +21,7 @@ USE_XPM= yes USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN6= wmpuzzle.6 diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile index 630b7ba13ba2..4c534c795d38 100644 --- a/games/xabacus/Makefile +++ b/games/xabacus/Makefile @@ -20,7 +20,7 @@ USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN6= xabacus.6 diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile index 9e725c4bca02..78dcf0cadc3a 100644 --- a/german/ksteak/Makefile +++ b/german/ksteak/Makefile @@ -26,7 +26,7 @@ USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index 3a3b25ce3681..95cd8073f35c 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ USE_GL= yes USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-pthread=yes --enable-threadsafe \ --enable-3ds-import --enable-sound INSTALLS_SHLIB= yes diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile index f52ed89993a7..beef1a73fcbe 100644 --- a/graphics/Hermes/Makefile +++ b/graphics/Hermes/Makefile @@ -19,7 +19,7 @@ COMMENT= Fast pixel formats conversion library USE_BZIP2= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" INSTALLS_SHLIB= yes diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index f197f7c2d807..c33bfb487326 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -21,7 +21,7 @@ USE_GCC= 3.4 USE_GL= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" INSTALLS_SHLIB= yes diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile index 5f9de0a1d18d..734050c240e4 100644 --- a/graphics/demeter/Makefile +++ b/graphics/demeter/Makefile @@ -27,7 +27,7 @@ WANT_SDL= yes USE_AUTOCONF_VER= 253 USE_AUTOMAKE_VER= 15 USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" INSTALLS_SHLIB= yes diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile index 9392d1bac656..ff9802a33751 100644 --- a/graphics/divxcalc/Makefile +++ b/graphics/divxcalc/Makefile @@ -20,7 +20,7 @@ USE_GMAKE= yes WANT_AUTOMAKE_VER= 15 WANT_AUTOCONF_VER= 253 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include PLIST_FILES= bin/divxcalc diff --git a/graphics/dvipng/Makefile b/graphics/dvipng/Makefile index 9b10b9f62748..d4bea81f3ed9 100644 --- a/graphics/dvipng/Makefile +++ b/graphics/dvipng/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index e591cb05e1a7..c9576a3dbb0b 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile index 61e7aa7e12ab..7a72c44e02c3 100644 --- a/graphics/ftgl/Makefile +++ b/graphics/ftgl/Makefile @@ -26,7 +26,7 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME:U} CONFIGURE_WRKSRC= ${WRKSRC}/unix -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-gl-inc=${X11BASE}/include --with-gl-lib=${X11BASE}/lib BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} diff --git a/graphics/g3dviewer/Makefile b/graphics/g3dviewer/Makefile index d0849d689235..019eec776858 100644 --- a/graphics/g3dviewer/Makefile +++ b/graphics/g3dviewer/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea USE_GNOME= gtk12 USE_MESA= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= \ CPPFLAGS="${PTHREAD_CFLAGS} `${GTK_CONFIG} --cflags` -fPIC" \ LDFLAGS="${PTHREAD_LIBS} `${GTK_CONFIG} --libs` -lGL -lGLU -lglut" diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index e80d9a3cad39..b43c6f010874 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ BUILD_CANVAS="${BUILD_CANVAS}" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} BUILD_CANVAS?= no diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index adc474df5b60..95e2185862e6 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -19,7 +19,7 @@ USE_GMAKE= YES USE_LIBTOOL_VER=15 USE_BZIP2= YES -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= YES diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index a0fd27c8183e..ba7dbe4f18ef 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Tools and library routines for working with GIF images -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_BZIP2= yes USE_INC_LIBTOOL_VER=15 diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile index 2d2a5c6b35b5..31d861f59662 100644 --- a/graphics/gifsicle/Makefile +++ b/graphics/gifsicle/Makefile @@ -14,7 +14,7 @@ MAINTAINER= bradh@uunet.co.za COMMENT= Manipulates GIF images and animations GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= gifdiff.1 gifsicle.1 diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile index 2c0620c3544e..e7e93bf030ca 100644 --- a/graphics/gltt/Makefile +++ b/graphics/gltt/Makefile @@ -19,7 +19,7 @@ USE_MESA= yes USE_FREETYPE= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype1 \ diff --git a/graphics/gozer/Makefile b/graphics/gozer/Makefile index 83e8f4660db2..32d5d7e1095a 100644 --- a/graphics/gozer/Makefile +++ b/graphics/gozer/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-porbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-porbld-freebsd${OSREL} CONFIGURE_ARGS= --with-giblib-prefix=${X11BASE} MAN1= gozer.1 diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile index 183713180e13..75d862741a2c 100644 --- a/graphics/hs-hgl/Makefile +++ b/graphics/hs-hgl/Makefile @@ -30,7 +30,7 @@ MAKE_ENV= system=FreeBSD \ hugs_install=${HGL_LIBS} ALL_TARGET= all -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index f974ec333233..1b5a5a144ecb 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS= PTOptimizer:${PORTSDIR}/graphics/libpano12 \ PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_BZIP2= yes diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile index d814942c4706..cff6be73c3b3 100644 --- a/graphics/jpegpixi/Makefile +++ b/graphics/jpegpixi/Makefile @@ -16,7 +16,7 @@ COMMENT= Useful to correct images from digtal camera with CCD defects LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/kdc2tiff/Makefile b/graphics/kdc2tiff/Makefile index 3ae4c998174d..1f5d8f870c28 100644 --- a/graphics/kdc2tiff/Makefile +++ b/graphics/kdc2tiff/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index 200942101b55..f3cc43552f58 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -15,7 +15,7 @@ COMMENT= Graphics library that outputs text instead of pixels USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lm -lncurses" CONFIGURE_ARGS= --enable-ncurses --disable-doc diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile index a0fd27c8183e..ba7dbe4f18ef 100644 --- a/graphics/libungif/Makefile +++ b/graphics/libungif/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Tools and library routines for working with GIF images -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_BZIP2= yes USE_INC_LIBTOOL_VER=15 diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile index ce7820530c56..137e3945c501 100644 --- a/graphics/libvisual/Makefile +++ b/graphics/libvisual/Makefile @@ -23,7 +23,7 @@ USE_REINPLACE= yes USE_LIBTOOL_VER=15 CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile index ce7820530c56..137e3945c501 100644 --- a/graphics/libvisual04/Makefile +++ b/graphics/libvisual04/Makefile @@ -23,7 +23,7 @@ USE_REINPLACE= yes USE_LIBTOOL_VER=15 CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> diff --git a/graphics/libwpcg/Makefile b/graphics/libwpcg/Makefile index b4e0ebf2e97d..e240a371e395 100644 --- a/graphics/libwpcg/Makefile +++ b/graphics/libwpcg/Makefile @@ -18,7 +18,7 @@ COMMENT= A basic 2D/3D computer graphics library which uses OpenGL USE_GCC= 3.4 USE_MESA= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib -lGL -lGLU -lglut" diff --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile index c6226f70dda3..edd6b447e841 100644 --- a/graphics/linux-f10-gdk-pixbuf/Makefile +++ b/graphics/linux-f10-gdk-pixbuf/Makefile @@ -10,9 +10,9 @@ PORTVERSION= 0.22.0.11.3.5 PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} -MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${MACHINE_ARCH}/RPMS.updates +MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${ARCH}/RPMS.updates PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile index 771be258d8dd..618aba6b0ea2 100644 --- a/graphics/linux-f10-imlib/Makefile +++ b/graphics/linux-f10-imlib/Makefile @@ -13,6 +13,6 @@ CATEGORIES= graphics linux MAINTAINER= ports@FreeBSD.org COMMENT= RPM of imlib -RPM_SET= imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm +RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile index a17828596f65..5e4f0862e603 100644 --- a/graphics/linux-f10-jpeg/Makefile +++ b/graphics/linux-f10-jpeg/Makefile @@ -13,6 +13,6 @@ CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the JPEG lib -RPM_SET= libjpeg-6b-15.${MACHINE_ARCH}.rpm +RPM_SET= libjpeg-6b-15.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile index 7dc5f3cab911..9967515b75ec 100644 --- a/graphics/linux-f10-libmng/Makefile +++ b/graphics/linux-f10-libmng/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- -DISTNAME= libmng-${PORTVERSION}-1.${MACHINE_ARCH} +DISTNAME= libmng-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -29,8 +29,8 @@ ONLY_FOR_ARCHS= i386 DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST?= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST?= ${PKGDIR}/pkg-plist.${ARCH} +MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} # Let's avoid hardcoding 'en' as the language. LANG?= en @@ -38,8 +38,8 @@ RPM_MIRRORS= \ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \ ftp://ftp.mirrorservice.org/sites/ftp.redhat.com/pub/redhat/__DIR__/ -STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS -UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH} +STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS +UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ --nodeps --replacepkgs diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile index 6d7f53e16e9f..829cc41d0c72 100644 --- a/graphics/linux-f10-sdl_image/Makefile +++ b/graphics/linux-f10-sdl_image/Makefile @@ -11,7 +11,7 @@ PORTVERSION= 1.2.3 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ PKGNAMEPREFIX= linux- -DISTNAME= SDL_image-${PORTVERSION}-1.${MACHINE_ARCH} +DISTNAME= SDL_image-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile index 479616796878..5dd1c9d4d3b5 100644 --- a/graphics/linux-f10-ungif/Makefile +++ b/graphics/linux-f10-ungif/Makefile @@ -11,10 +11,10 @@ CATEGORIES= graphics linux MAINTAINTER= maho@FreeBSD.org COMMENT= RPM of the ungif lib -.if (${MACHINE_ARCH} == "i386") -RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm +.if (${ARCH} == "i386") +RPM_SET= libungif-4.1.0-7.${ARCH}.rpm .else -RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm +RPM_SET= libungif-4.1.0-8.${ARCH}.rpm .endif .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-f8-gdk-pixbuf/Makefile b/graphics/linux-f8-gdk-pixbuf/Makefile index c6226f70dda3..edd6b447e841 100644 --- a/graphics/linux-f8-gdk-pixbuf/Makefile +++ b/graphics/linux-f8-gdk-pixbuf/Makefile @@ -10,9 +10,9 @@ PORTVERSION= 0.22.0.11.3.5 PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} -MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${MACHINE_ARCH}/RPMS.updates +MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${ARCH}/RPMS.updates PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile index 771be258d8dd..618aba6b0ea2 100644 --- a/graphics/linux-f8-imlib/Makefile +++ b/graphics/linux-f8-imlib/Makefile @@ -13,6 +13,6 @@ CATEGORIES= graphics linux MAINTAINER= ports@FreeBSD.org COMMENT= RPM of imlib -RPM_SET= imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm +RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile index a17828596f65..5e4f0862e603 100644 --- a/graphics/linux-f8-jpeg/Makefile +++ b/graphics/linux-f8-jpeg/Makefile @@ -13,6 +13,6 @@ CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the JPEG lib -RPM_SET= libjpeg-6b-15.${MACHINE_ARCH}.rpm +RPM_SET= libjpeg-6b-15.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile index 7dc5f3cab911..9967515b75ec 100644 --- a/graphics/linux-f8-libmng/Makefile +++ b/graphics/linux-f8-libmng/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- -DISTNAME= libmng-${PORTVERSION}-1.${MACHINE_ARCH} +DISTNAME= libmng-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -29,8 +29,8 @@ ONLY_FOR_ARCHS= i386 DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST?= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST?= ${PKGDIR}/pkg-plist.${ARCH} +MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} # Let's avoid hardcoding 'en' as the language. LANG?= en @@ -38,8 +38,8 @@ RPM_MIRRORS= \ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \ ftp://ftp.mirrorservice.org/sites/ftp.redhat.com/pub/redhat/__DIR__/ -STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS -UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH} +STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS +UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ --nodeps --replacepkgs diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile index 6d7f53e16e9f..829cc41d0c72 100644 --- a/graphics/linux-f8-sdl_image/Makefile +++ b/graphics/linux-f8-sdl_image/Makefile @@ -11,7 +11,7 @@ PORTVERSION= 1.2.3 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ PKGNAMEPREFIX= linux- -DISTNAME= SDL_image-${PORTVERSION}-1.${MACHINE_ARCH} +DISTNAME= SDL_image-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile index 479616796878..5dd1c9d4d3b5 100644 --- a/graphics/linux-f8-ungif/Makefile +++ b/graphics/linux-f8-ungif/Makefile @@ -11,10 +11,10 @@ CATEGORIES= graphics linux MAINTAINTER= maho@FreeBSD.org COMMENT= RPM of the ungif lib -.if (${MACHINE_ARCH} == "i386") -RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm +.if (${ARCH} == "i386") +RPM_SET= libungif-4.1.0-7.${ARCH}.rpm .else -RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm +RPM_SET= libungif-4.1.0-8.${ARCH}.rpm .endif .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile index c6226f70dda3..edd6b447e841 100644 --- a/graphics/linux-gdk-pixbuf/Makefile +++ b/graphics/linux-gdk-pixbuf/Makefile @@ -10,9 +10,9 @@ PORTVERSION= 0.22.0.11.3.5 PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} -MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${MACHINE_ARCH}/RPMS.updates +MASTER_SITE_SUBDIR=fedora/fedora/${BASEVERSION}/${ARCH}/RPMS.updates PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${MACHINE_ARCH} +DISTNAME= ${PORTNAME}-${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+)\./\1-/}.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile index 771be258d8dd..618aba6b0ea2 100644 --- a/graphics/linux-imlib/Makefile +++ b/graphics/linux-imlib/Makefile @@ -13,6 +13,6 @@ CATEGORIES= graphics linux MAINTAINER= ports@FreeBSD.org COMMENT= RPM of imlib -RPM_SET= imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm +RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile index a17828596f65..5e4f0862e603 100644 --- a/graphics/linux-jpeg/Makefile +++ b/graphics/linux-jpeg/Makefile @@ -13,6 +13,6 @@ CATEGORIES= graphics linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the JPEG lib -RPM_SET= libjpeg-6b-15.${MACHINE_ARCH}.rpm +RPM_SET= libjpeg-6b-15.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile index 7dc5f3cab911..9967515b75ec 100644 --- a/graphics/linux-libmng/Makefile +++ b/graphics/linux-libmng/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 1 CATEGORIES= graphics linux MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} PKGNAMEPREFIX= linux- -DISTNAME= libmng-${PORTVERSION}-1.${MACHINE_ARCH} +DISTNAME= libmng-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= @@ -29,8 +29,8 @@ ONLY_FOR_ARCHS= i386 DIST_SUBDIR= rpm NO_BUILD= yes NO_FILTER_SHLIBS= yes -PLIST?= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST?= ${PKGDIR}/pkg-plist.${ARCH} +MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH} # Let's avoid hardcoding 'en' as the language. LANG?= en @@ -38,8 +38,8 @@ RPM_MIRRORS= \ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \ ftp://ftp.mirrorservice.org/sites/ftp.redhat.com/pub/redhat/__DIR__/ -STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS -UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH} +STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS +UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH} DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ --nodeps --replacepkgs diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile index 6d7f53e16e9f..829cc41d0c72 100644 --- a/graphics/linux-sdl_image/Makefile +++ b/graphics/linux-sdl_image/Makefile @@ -11,7 +11,7 @@ PORTVERSION= 1.2.3 CATEGORIES= graphics linux MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ PKGNAMEPREFIX= linux- -DISTNAME= SDL_image-${PORTVERSION}-1.${MACHINE_ARCH} +DISTNAME= SDL_image-${PORTVERSION}-1.${ARCH} EXTRACT_SUFX= .rpm EXTRACT_ONLY= diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile index 479616796878..5dd1c9d4d3b5 100644 --- a/graphics/linux-ungif/Makefile +++ b/graphics/linux-ungif/Makefile @@ -11,10 +11,10 @@ CATEGORIES= graphics linux MAINTAINTER= maho@FreeBSD.org COMMENT= RPM of the ungif lib -.if (${MACHINE_ARCH} == "i386") -RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm +.if (${ARCH} == "i386") +RPM_SET= libungif-4.1.0-7.${ARCH}.rpm .else -RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm +RPM_SET= libungif-4.1.0-8.${ARCH}.rpm .endif .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index 5e906d73906e..32778a540849 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -31,7 +31,7 @@ ALL_TARGET= # empty .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -Wunused-variable CXXFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -Wunused-variable -Wno-multichar -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") CFLAGS+= -mcpu=i686 -march=i686 -mfancy-math-387 CXXFLAGS+= -mcpu=i686 -march=i686 -mfancy-math-387 .endif # i386 diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index 1736a1d2060b..5e9815706d1f 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -28,7 +28,7 @@ USE_GL= yes USE_MOTIF= yes USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-javadx CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV= ARCH="${OPSYS:L}" \ diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index c3159a5b80eb..a8b221da1fc1 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -25,7 +25,7 @@ USE_X_PREFIX= yes WANT_AUTOMAKE_VER= 15 USE_AUTOCONF_VER= 213 USE_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 2f6adf577740..5d6b84e3612b 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib .endif @@ -39,7 +39,7 @@ LATEST_LINK= ${PORTNAME}36 .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations CXXFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar -.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" ) +.if (${ARCH} == "i386" && !${ARCH} == "amd64" ) CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double CXXFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double .endif # i386 @@ -52,7 +52,7 @@ CFLAGS= -O3 -tpp7 -axN -Vaxlib CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index 2f6adf577740..5d6b84e3612b 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib .endif @@ -39,7 +39,7 @@ LATEST_LINK= ${PORTNAME}36 .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations CXXFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar -.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" ) +.if (${ARCH} == "i386" && !${ARCH} == "amd64" ) CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double CXXFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double .endif # i386 @@ -52,7 +52,7 @@ CFLAGS= -O3 -tpp7 -axN -Vaxlib CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 2f6adf577740..5d6b84e3612b 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib .endif @@ -39,7 +39,7 @@ LATEST_LINK= ${PORTNAME}36 .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations CXXFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar -.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" ) +.if (${ARCH} == "i386" && !${ARCH} == "amd64" ) CFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double CXXFLAGS+= -mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double .endif # i386 @@ -52,7 +52,7 @@ CFLAGS= -O3 -tpp7 -axN -Vaxlib CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --x-includes="${X11BASE}/include" --includedir=${LOCALBASE} \ CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ CFLAGS="${CFLAGS} -L${LOCALBASE}/lib -I${LOCALBASE}/include" \ diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile index 4764c0771a9e..87b661f45207 100644 --- a/graphics/qglviewer/Makefile +++ b/graphics/qglviewer/Makefile @@ -19,7 +19,7 @@ USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${X11BASE}" INSTALLS_SHLIB= yes diff --git a/graphics/qtutils/Makefile b/graphics/qtutils/Makefile index 16a619ddaa14..c22366d31ac9 100644 --- a/graphics/qtutils/Makefile +++ b/graphics/qtutils/Makefile @@ -22,7 +22,7 @@ USE_GNOME= glib12 USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= qtconv.1 qtsg.1 qtsplit.1 diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index ca7ccdd5e9e6..42501f7f699e 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -21,7 +21,7 @@ COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM) USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GL= yes USE_X_PREFIX= yes .ifdef (WITH_QUESA_EXAMPLES) diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile index 4db4810e78fd..d9d427ee1fa0 100644 --- a/graphics/sam2p/Makefile +++ b/graphics/sam2p/Makefile @@ -28,7 +28,7 @@ PLIST_FILES= bin/sam2p USE_PERL5_BUILD= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} ALL_TARGET= ${PORTNAME} .include <bsd.port.pre.mk> diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile index 8e3bcfc6a846..c4cb592d396f 100644 --- a/graphics/scrot/Makefile +++ b/graphics/scrot/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} .if defined(NOPORTDOCS) MAKE_ENV= NO_DOC=yes diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile index 93702323a018..8e0506dfd7b6 100644 --- a/graphics/sdl_gfx/Makefile +++ b/graphics/sdl_gfx/Makefile @@ -20,7 +20,7 @@ USE_SDL= sdl USE_REINPLACE= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --includedir=${PREFIX}/include/SDL11 \ --disable-mmx MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 490813ee4fa3..9af5766024f9 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -22,7 +22,7 @@ USE_SDL= sdl USE_GMAKE= yes USE_LIBTOOL_VER=15 LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" CONFIGURE_ARGS= --enable-tif --enable-xcf diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile index 59160670f748..a424637a6ddd 100644 --- a/graphics/sdl_ttf/Makefile +++ b/graphics/sdl_ttf/Makefile @@ -22,7 +22,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ARGS= LT_CURRENT=3 LT_REVISION=0 LT_AGE=0 diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 92920dcaf489..dbe18f27eb66 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ USE_XLIB= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-mpeg2enc diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile index 874dd0dfe836..ab31627848f4 100644 --- a/graphics/swftools/Makefile +++ b/graphics/swftools/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_BISON= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 png2swf.1 \ diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile index 4ee62f0869dd..309c8226d846 100644 --- a/graphics/tif22pnm/Makefile +++ b/graphics/tif22pnm/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libtiff-ldir=${LOCALBASE}/lib \ --with-libtiff-idir=${LOCALBASE}/include diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 75cf7e4e5531..304aa8d968d1 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -25,7 +25,7 @@ USE_REINPLACE= yes USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index f99b66d24803..8159d5efa06d 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -24,7 +24,7 @@ USE_MOTIF= yes USE_GL= yes USE_SDL= sdl GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ YACC="/usr/bin/byacc" CONFIGURE_ARGS= --with-optimization \ diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile index c818c3c5605e..696afe84e51f 100644 --- a/graphics/xmedcon/Makefile +++ b/graphics/xmedcon/Makefile @@ -16,7 +16,7 @@ COMMENT= A medical image conversion utility and library USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_SUBMAKE= yes OPTIONS= X11 "With X11" on \ diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index 9ed2f32ebaaf..a908fe75df6b 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -13,6 +13,20 @@ MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ ${MASTER_SITE_TEX_CTAN} MASTER_SITE_SUBDIR= support/xpdf +.if defined(WANT_ANTIKICK) +PATCH_SITES= http://www.cs.cmu.edu/~dst/Adobe/Gallery/XPDF/anti-kick/ +PATCHFILES= anti.diff +#.else +#PATCH_SITES= http://vzzbx.xs4all.nl/files/ \ +# http://www.cs.cmu.edu/~dst/Adobe/Gallery/ +#PATCHFILES= xpdf-ro-remove.patch +.endif +PATCH_DIST_STRIP= -p1 +PATCH_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \ + ${MASTER_SITE_TEX_CTAN} +PATCH_SITE_SUBDIR= support/xpdf +PATCHFILES= xpdf-2.01-patch1 + MAINTAINER= nork@FreeBSD.org COMMENT= Display PDF files, and convert them to other formats @@ -26,7 +40,7 @@ USE_MOTIF= yes USE_GMAKE= yes USE_AUTOCONF_VER= 259 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-gzip --enable-opi --with-x \ @@ -37,6 +51,9 @@ CONFIGURE_ARGS= --with-gzip --enable-opi --with-x \ .if defined(A4) CONFIGURE_ARGS+= --enable-a4-paper .endif +.if defined(WANT_ANTIKICK) +CONFIGURE_ARGS+= --enable-antikick +.endif MAN1= pdffonts.1 \ pdfimages.1 \ @@ -56,3 +73,7 @@ post-install: .endif .include <bsd.port.mk> + +.if ${ARCH} == "amd64" +CFLAGS+= -static +.endif diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile index fabe72399ba9..ba70cef3ec5c 100644 --- a/graphics/zimg/Makefile +++ b/graphics/zimg/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd USE_GETOPT_LONG= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-dynaload-cc="${CC}" \ --with-dynaload-cflags="${CFLAGS} -shared" \ --with-gd-includes="${LOCALBASE}/include" \ diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile index 566a6d1b6f45..a5879a5a5da5 100644 --- a/irc/bitchx/Makefile +++ b/irc/bitchx/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ --bindir="${PREFIX}/bin" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" \ - --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} + --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/irc/bopm/Makefile b/irc/bopm/Makefile index d94f88180110..7c58a62f544c 100644 --- a/irc/bopm/Makefile +++ b/irc/bopm/Makefile @@ -16,7 +16,7 @@ COMMENT= Open proxy monitor and blocker, designed for use with ircds USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc INSTALLS_SHLIB= yes diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile index 863f75301b90..384a5ff31f31 100644 --- a/irc/eggdrop/Makefile +++ b/irc/eggdrop/Makefile @@ -19,7 +19,7 @@ MAINTAINER= q@uni.de COMMENT= The most popular open source Internet Relay Chat bot USE_BZIP2= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(WITHOUT_TCL) LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84 diff --git a/irc/irc/Makefile b/irc/irc/Makefile index 2f00bb1b7632..1138cb51e900 100644 --- a/irc/irc/Makefile +++ b/irc/irc/Makefile @@ -47,10 +47,10 @@ pre-build: @${SED} -e "s;%%PREFIX%%;${PREFIX};g" ${FILESDIR}/ircd.sh > ${WRKDIR}/ircd.sh do-build: - @(cd ${WRKSRC}/${MACHINE_ARCH}-unknown-freebsd${OSREL}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${WRKSRC}/${ARCH}-unknown-freebsd${OSREL}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) do-install: - @(cd ${WRKSRC}/${MACHINE_ARCH}-unknown-freebsd${OSREL} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${WRKSRC}/${ARCH}-unknown-freebsd${OSREL} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) post-install: @if [ ! -f ${STARTUP_SCRIPT} ]; then \ diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index 710cabadd760..0903c0044de0 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes WANT_GNOME= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= irssi.1 diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 710cabadd760..0903c0044de0 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes WANT_GNOME= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= irssi.1 diff --git a/irc/miau/Makefile b/irc/miau/Makefile index 2540f51a5b23..ad9bbe4f0fad 100644 --- a/irc/miau/Makefile +++ b/irc/miau/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-dccbounce \ --enable-empty-awaymsg \ --enable-dumpstatus \ --disable-dependency-tracking -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ LIBS="${LIBS}" diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile index 244b14caa21f..c4c3a65b587f 100644 --- a/irc/ngircd/Makefile +++ b/irc/ngircd/Makefile @@ -15,7 +15,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Free open source daemon for Internet Relay Chat (IRC) GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile index 9a3def068069..bb67585e4968 100644 --- a/irc/quirc/Makefile +++ b/irc/quirc/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-wish=${LOCALBASE}/bin/wish8.4 \ --with-tcl-include-dir=${LOCALBASE}/include/tcl8.4 \ --with-tk-include-dir=${LOCALBASE}/include/tk8.4 \ diff --git a/irc/srvx/Makefile b/irc/srvx/Makefile index 3293b97fcc6b..4f3782c56d1c 100644 --- a/irc/srvx/Makefile +++ b/irc/srvx/Makefile @@ -15,7 +15,7 @@ MAINTAINER= weaseal@users.sourceforge.net COMMENT= Srvx IRC services GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile index 73d4e02baf1d..8d10283447b2 100644 --- a/irc/undernet-ircu/Makefile +++ b/irc/undernet-ircu/Makefile @@ -17,7 +17,7 @@ COMMENT= Undernet IRCU irc daemon CONFLICTS= ircd-hybrid* GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-dpath=${PREFIX}/etc --with-symlink=no PLIST_FILES= bin/chkconf bin/ircd etc/ircd.conf.example diff --git a/irc/xaric/Makefile b/irc/xaric/Makefile index 757470172e4c..4dcd126ef53d 100644 --- a/irc/xaric/Makefile +++ b/irc/xaric/Makefile @@ -16,7 +16,7 @@ COMMENT= IRC Client similer to BitchX or ircII USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= xaric.1 diff --git a/japanese/bookview/Makefile b/japanese/bookview/Makefile index 803876739987..4d4f70ba5509 100644 --- a/japanese/bookview/Makefile +++ b/japanese/bookview/Makefile @@ -17,7 +17,7 @@ COMMENT= NDTP client written in Tcl/Tk RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= WISH=${LOCALBASE}/bin/wish8.4 .include <bsd.port.mk> diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile index ad75d36cb115..c2de232876dd 100644 --- a/japanese/eb/Makefile +++ b/japanese/eb/Makefile @@ -61,7 +61,7 @@ USE_GETTEXT= yes USE_PERL5= yes USE_LIBTOOL_VER= 15 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-nls \ --with-gettext-includes=${LOCALBASE}/include \ --with-gettext-libraries=${LOCALBASE}/lib \ diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile index 526ba5a241bf..3f9bb04c5f58 100644 --- a/japanese/eb3/Makefile +++ b/japanese/eb3/Makefile @@ -63,7 +63,7 @@ USE_GETTEXT= yes USE_PERL5= yes USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-nls \ --with-gettext-includes=${LOCALBASE}/include \ --with-gettext-libraries=${LOCALBASE}/lib \ diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile index c1a942ea84b7..1232d000a4c9 100644 --- a/japanese/eblook/Makefile +++ b/japanese/eblook/Makefile @@ -18,7 +18,7 @@ COMMENT= Interactive EB interface command for seraching words in electoric dicti LIB_DEPENDS= eb.9:${PORTSDIR}/japanese/eb GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-eb-includes=${PREFIX}/include \ --with-eb-libraries=${PREFIX}/lib diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile index a2987a588e0d..1dbcb78a54c9 100644 --- a/japanese/ebnetd/Makefile +++ b/japanese/ebnetd/Makefile @@ -18,7 +18,7 @@ COMMENT= Servers for accessing CD-ROM books via TCP/IP LIB_DEPENDS= eb.9:${PORTSDIR}/japanese/eb GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${RUNDIR} --with-logdir=${LOGDIR} # Local variables diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile index 6568fee6ead8..a35c9ffc9ba5 100644 --- a/japanese/ebview/Makefile +++ b/japanese/ebview/Makefile @@ -23,7 +23,7 @@ USE_GETOPT_LONG= yes USE_GNOME= imlib USE_GMAKE= yes USE_AUTOCONF_VER= 253 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index fba2a206c59d..b87c05ef6966 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -42,7 +42,7 @@ WITH_FREEWNN?= NO WITH_CANNA?= YES WITH_SJ3?= NO -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if !defined(NO_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile index 640a83a0d177..a4e2f475c94d 100644 --- a/japanese/emacs20-dl-canna/Makefile +++ b/japanese/emacs20-dl-canna/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --with-canna-includes=${PREFIX}/include \ --with-canna-libraries=${PREFIX}/lib \ --with-emacs-srcdir=${EMACSDL_SRCDIR} CONFIGURE_ENV= EMACS="emacs-dl-${EMACS_VER}" -PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \ +PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${ARCH}--freebsd \ DLCANNA_VER=${DLCANNA_VER} LISPDIR=${LISPDIR} DOCDIR=${DOCDIR} # ports variables diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile index 297bf2d766f7..01d59ba61ab9 100644 --- a/japanese/emacs20-dl-wnn6/Makefile +++ b/japanese/emacs20-dl-wnn6/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --with-wnn6 \ --with-wnn-libraries=${PREFIX}/lib \ --with-emacs-src=${EMACSDL_SRCDIR} CONFIGURE_ENV= EMACS=${PREFIX}/bin/emacs-dl-${EMACS_VER} -PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \ +PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${ARCH}--freebsd \ DOCDIR=${DOCDIR} DOCDIR= share/doc/emacs20-dl-wnn6 diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile index fbe86e2f4f1d..86f8d87af4a0 100644 --- a/japanese/emacs20-emcws/Makefile +++ b/japanese/emacs20-emcws/Makefile @@ -39,7 +39,7 @@ WITH_FREEWNN?= NO WITH_CANNA?= YES WITH_SJ3?= NO -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd .if !defined(NO_X11) CONFIGURE_ARGS= --with-x-toolkit --with-pop diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index ff9f9a693e5a..effd0d5d886e 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -31,7 +31,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile index db4b1f0af62c..a24c34bb573b 100644 --- a/japanese/iiimf-le-freewnn/Makefile +++ b/japanese/iiimf-le-freewnn/Makefile @@ -32,7 +32,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile index 0fd3182c3134..ae474ffe483b 100644 --- a/japanese/perl5/Makefile +++ b/japanese/perl5/Makefile @@ -131,7 +131,7 @@ post-install: @${LN} -fs ${PREFIX}/bin/perl${JPERL_VERSION} ${PREFIX}/bin/jperl${JPERL_VERSION} @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/suidperl @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/jsuidperl - @${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/${MACHINE_ARCH}-freebsd/CORE/libperl.so + @${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/${ARCH}-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/${ARCH}-freebsd/CORE/libperl.so @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/korean/hanemacs/Makefile b/korean/hanemacs/Makefile index f3c878e48b30..2240af04c1fd 100644 --- a/korean/hanemacs/Makefile +++ b/korean/hanemacs/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-x-toolkit \ --sharedstatedir=/var/run -CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd +CONFIGURE_TARGET= ${ARCH}--freebsd STRIP= MAN1= emacs.1 etags.1 ctags.1 diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index c544ebb2a999..23cc561f7fa8 100644 --- a/korean/iiimf-le-hangul/Makefile +++ b/korean/iiimf-le-hangul/Makefile @@ -29,7 +29,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/korean/uniksc/Makefile b/korean/uniksc/Makefile index a3b9fec60477..cb7711dac3b5 100644 --- a/korean/uniksc/Makefile +++ b/korean/uniksc/Makefile @@ -15,7 +15,7 @@ COMMENT= Converts data between Korean KSC-5601 and Unicode 3.0 UTF-16 INSTALLS_SHLIB= YES -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= "-fPIC" .endif diff --git a/lang/asn1c/Makefile b/lang/asn1c/Makefile index 263e27ea644a..d084903381c6 100644 --- a/lang/asn1c/Makefile +++ b/lang/asn1c/Makefile @@ -16,7 +16,7 @@ MAINTAINER= vlm@lionet.info COMMENT= Modern ASN.1 to C compiler GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_PERL5= yes MAN1= asn1c.1 enber.1 unber.1 diff --git a/lang/cyclone/Makefile b/lang/cyclone/Makefile index a5b8080725c3..9f4534a79cb8 100644 --- a/lang/cyclone/Makefile +++ b/lang/cyclone/Makefile @@ -22,9 +22,9 @@ ONLY_FOR_ARCHS= i386 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_SUB+= DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \ - PORTBLD=${MACHINE_ARCH}-portbld-freebsd${OSREL} + PORTBLD=${ARCH}-portbld-freebsd${OSREL} ALL_TARGET= all gprof aprof CYCBINDIR= ${PREFIX}/bin CYCINCDIR= ${PREFIX}/include/cyclone @@ -32,10 +32,6 @@ CYCLIBDIR= ${PREFIX}/lib/cyclone .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500000 -BROKEN= "Cannot convert header files on -CURRENT!" -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${DOCSDIR}/online-manual diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 07f2f2a605ad..861d52d2bab0 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_MOTIF= yes USE_LIBTOOL_VER=13 LIBTOOLFLAGS= # none -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile index c0f7ab668f96..568161afacdb 100644 --- a/lang/ferite/Makefile +++ b/lang/ferite/Makefile @@ -20,11 +20,11 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" INSTALLS_SHLIB= yes -PLIST_SUB= MACHINE_ARCH=${MACHINE_ARCH} +PLIST_SUB= ARCH=${ARCH} MAN1= builder.1 ferite.1 diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index cf9b8f62726c..40ef3228c6f1 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -41,13 +41,13 @@ MAN1= gforth.1 # Local variables # -.if ${MACHINE_ARCH} == i386 +.if ${ARCH} == i386 WORDSIZE=32 .else WORDSIZE=64 .endif -.if ${MACHINE_ARCH} == sparc64 +.if ${ARCH} == sparc64 BYTEORDER=b .else BYTEORDER=l diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile index a8765a57b71e..ed94cd7417aa 100644 --- a/lang/gprolog/Makefile +++ b/lang/gprolog/Makefile @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}.orig/src/src USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOCONF_VER= 253 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-c-flags="${CFLAGS}" \ --with-doc-dir=none \ --with-examples-dir="${EXAMPLESDIR}" diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index 5ffa289c8107..a5f38731f8c9 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -35,7 +35,7 @@ USE_GL= yes MAN1= hugs.1 -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= "-fPIC" .endif diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile index 17ec79a9845f..909040e7243d 100644 --- a/lang/libutils/Makefile +++ b/lang/libutils/Makefile @@ -19,7 +19,7 @@ COMMENT= Support lib for Tensile/NSL USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= CFLAGS="${CFLAGS}" INSTALLS_SHLIB= yes diff --git a/lang/lua/Makefile b/lang/lua/Makefile index 227d4889b2a3..06effc4359cb 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -44,7 +44,7 @@ post-install: @cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} .endif -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/lang/lua4/Makefile b/lang/lua4/Makefile index c79d286f7b62..e0a2c91eeb12 100644 --- a/lang/lua4/Makefile +++ b/lang/lua4/Makefile @@ -48,7 +48,7 @@ post-install: @${STRIP_CMD} ${PREFIX}/bin/lua @${STRIP_CMD} ${PREFIX}/bin/luac -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/lang/lua50/Makefile b/lang/lua50/Makefile index 227d4889b2a3..06effc4359cb 100644 --- a/lang/lua50/Makefile +++ b/lang/lua50/Makefile @@ -44,7 +44,7 @@ post-install: @cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} .endif -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile index 539b59c7ca37..c225faf5df24 100644 --- a/lang/nickle/Makefile +++ b/lang/nickle/Makefile @@ -15,7 +15,7 @@ COMMENT= A desk calculator language USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} # Nickle now has bindings which are likely to pull in libraries that need # libpthread. Link to it now, since it wouldn't work at runtime. diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile index 0fe6db541e02..c04be4c428e7 100644 --- a/lang/onyx/Makefile +++ b/lang/onyx/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= edit.5:${PORTSDIR}/devel/libedit \ USE_BZIP2= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libedit-prefix=${LOCALBASE} \ --with-pcre-prefix=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile index 75c492113156..d1ddcad65199 100644 --- a/lang/open-cobol-devel/Makefile +++ b/lang/open-cobol-devel/Makefile @@ -21,7 +21,7 @@ USE_LIBLTDL= yes USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile index 75c492113156..d1ddcad65199 100644 --- a/lang/open-cobol/Makefile +++ b/lang/open-cobol/Makefile @@ -21,7 +21,7 @@ USE_LIBLTDL= yes USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python/Makefile b/lang/python/Makefile index 906d0506b333..a1f0311e0171 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -19,7 +19,7 @@ CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python23/Makefile b/lang/python23/Makefile index ebcd80d5b431..8ca303cca73f 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -19,7 +19,7 @@ CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 906d0506b333..a1f0311e0171 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -19,7 +19,7 @@ CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python25/Makefile b/lang/python25/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python26/Makefile b/lang/python26/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python27/Makefile b/lang/python27/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python30/Makefile b/lang/python30/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python31/Makefile b/lang/python31/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/python32/Makefile b/lang/python32/Makefile index e97fbac0eb7d..68e64c32a310 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -21,7 +21,7 @@ COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" diff --git a/lang/rscheme/Makefile b/lang/rscheme/Makefile index 1646fb33c845..88ae4ef6d79b 100644 --- a/lang/rscheme/Makefile +++ b/lang/rscheme/Makefile @@ -15,7 +15,7 @@ DISTNAME= rs-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= An object-oriented, extended version of the Scheme dialect of Lisp -.if ${MACHINE_ARCH} != "i386" +.if ${ARCH} != "i386" BROKEN= "fails to install on ${ARCH}" .endif diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 351f896b0eae..9deccc3e26f1 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -21,7 +21,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --disable-gtk --without-emacs --without-gmp diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 210c00118345..26bbe214bb82 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --host=${MACHINE_ARCH}-${OPSYS:L} --disable-mt +CONFIGURE_ARGS= --host=${ARCH}-${OPSYS:L} --disable-mt MAN1= pl.1 plrc.1 plld.1 PLIST_SUB= DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OPSYS:L} diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile index 01d70d37fb84..f98aac456e04 100644 --- a/lang/tensile/Makefile +++ b/lang/tensile/Makefile @@ -25,7 +25,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=13 LIBTOOLFLAGS= # none -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-module-postgres diff --git a/lang/xsb/Makefile b/lang/xsb/Makefile index 7204f8b8c13d..94781a3fe6f5 100644 --- a/lang/xsb/Makefile +++ b/lang/xsb/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes MAN1= xsb.1 -PLIST_SUB+= MACHINE_ARCH=${MACHINE_ARCH} \ +PLIST_SUB+= ARCH=${ARCH} \ OPSYS=${OPSYS:S/BSD/bsd/g:S/F/f/g:S/O/o/g:S/N/n/g} .include <bsd.port.pre.mk> diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile index 4b4c40f2ab88..f580fcaee4a9 100644 --- a/lang/yabasic/Makefile +++ b/lang/yabasic/Makefile @@ -17,7 +17,7 @@ USE_XLIB= yes USE_BISON= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= yabasic.1 PORTDOCS= yabasic.htm diff --git a/lang/yap/Makefile b/lang/yap/Makefile index 26af5f75c894..90e22143bc7d 100644 --- a/lang/yap/Makefile +++ b/lang/yap/Makefile @@ -19,7 +19,7 @@ COMMENT= A high-performance Prolog compiler LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile index 2a7f71e77d8a..e57f8e038fa6 100644 --- a/mail/anubis/Makefile +++ b/mail/anubis/Makefile @@ -30,7 +30,7 @@ COMMENT= Outgoing SMTP mail processor USE_REINPLACE= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" LDFLAGS="${LDFLAGS}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS+= -L${LOCALBASE}/lib diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile index b59e7a320d30..e4fe206ee686 100644 --- a/mail/bbmail/Makefile +++ b/mail/bbmail/Makefile @@ -16,7 +16,7 @@ COMMENT= A tool intended for Blackbox that checks for new mail USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= bbmail.1 PLIST_FILES= bin/bbmail share/bbtools/bbmail.bb diff --git a/mail/bincimap/Makefile b/mail/bincimap/Makefile index d18fd38822c4..92b81541d853 100644 --- a/mail/bincimap/Makefile +++ b/mail/bincimap/Makefile @@ -24,7 +24,7 @@ COMMENT= Light-weight IMAP server for Maildir USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} CONFDIR= ${PREFIX}/etc/${PORTNAME} diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile index cf2aedea2365..45101502b6df 100644 --- a/mail/bogofilter-current/Makefile +++ b/mail/bogofilter-current/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-included-gsl CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include/db42" \ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.2" CONFIGURE_ENV+= PERL="${PERL}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALL_TARGET= install-strip prefix=${PREFIX} MAN1= bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1 diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index cf2aedea2365..45101502b6df 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-included-gsl CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include/db42" \ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb-4.2" CONFIGURE_ENV+= PERL="${PERL}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALL_TARGET= install-strip prefix=${PREFIX} MAN1= bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1 diff --git a/mail/cone/Makefile b/mail/cone/Makefile index 87f8a715c505..da84a132322a 100644 --- a/mail/cone/Makefile +++ b/mail/cone/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS= -C --without-db --prefix=${PREFIX} --exec-prefix=${PREFIX} CONFIGURE_ENV= REHASH="${PERL} ${SCRIPTDIR}/c_rehash" LDFLAGS=-L${LOCALBASE}/lib \ CPPFLAGS=-I${LOCALBASE}/include -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= cone.1 leaf.1 mailtool.1 INSTALL_TARGET= install-strip diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/mail/courier-authlib-vchkpw/Makefile +++ b/mail/courier-authlib-vchkpw/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/mail/courier-authlib/Makefile +++ b/mail/courier-authlib/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index b4d80a73214d..7ea384acb78c 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -61,7 +61,7 @@ PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ USERDB=${USERDB:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --with-userdb=${USERDB} \ --datadir=${DATADIR} \ diff --git a/mail/courier/Makefile b/mail/courier/Makefile index 2f9d56842b2e..ee3bd65b9adb 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash \ CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE_ENV:= ${CONFIGURE_ENV} -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-root-check --with-db=db \ --enable-syslog=1 --enable-use-flock \ --program-transform-name=s,^,, \ diff --git a/mail/crashecho/Makefile b/mail/crashecho/Makefile index 6b92678c8fe9..2f9eccf0cb01 100644 --- a/mail/crashecho/Makefile +++ b/mail/crashecho/Makefile @@ -16,7 +16,7 @@ COMMENT= An FTN JAM and *.MSG tosser LIB_DEPENDS= jam.2:${PORTSDIR}/mail/jamlib USE_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= crashecho.1 \ crashexport.1 \ diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile index 359f2da2017f..9ed102257819 100644 --- a/mail/dovecot-devel/Makefile +++ b/mail/dovecot-devel/Makefile @@ -20,7 +20,7 @@ USE_ICONV= yes USE_RC_SUBR= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-shadow --with-pam --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 359f2da2017f..9ed102257819 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -20,7 +20,7 @@ USE_ICONV= yes USE_RC_SUBR= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-shadow --with-pam --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index 7b232f212177..5f791ef8e690 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -92,7 +92,7 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .ifdef(GDBS) CFLAGS+= -g -DDEBUG diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index c7028641dad8..1dfb3c74d5cb 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -89,7 +89,7 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .ifdef(GDBS) CFLAGS+= -g -DDEBUG diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile index cfe44bef2422..15e2bc3b881e 100644 --- a/mail/esmtp/Makefile +++ b/mail/esmtp/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= esmtp.6:${PORTSDIR}/mail/libesmtp USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG= yes USE_OPENSSL= yes USE_REINPLACE= yes diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 06cf76db4de4..dd977de6f578 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -30,7 +30,7 @@ WITH_AUDIO= # none PLIST_SUB+= X11="" USE_GNOME= gnomehack gtk12 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I../compface -I${LOCALBASE}/include" \ LDFLAGS="-L../compface -L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-imap --enable-pop \ diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 3a556e82c09e..7ed6a47e838e 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -35,7 +35,7 @@ USE_PYTHON= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-opie --enable-RPA --enable-POP2 --enable-SDPS \ --with-hesiod=no --enable-fallback=no CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile index 01f240b4b988..07e51583e400 100644 --- a/mail/filtermail/Makefile +++ b/mail/filtermail/Makefile @@ -32,7 +32,7 @@ USE_GETOPT_LONG= yes USE_BISON= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= filtermail.1 diff --git a/mail/gensig/Makefile b/mail/gensig/Makefile index f3deabca8080..4402078c9a3f 100644 --- a/mail/gensig/Makefile +++ b/mail/gensig/Makefile @@ -15,7 +15,7 @@ MAINTAINER= arensb+freebsd-ports@ooblick.com COMMENT= A random .signature generator GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG= yes diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index 221c2212625a..20cdf82ccc3a 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -24,7 +24,7 @@ USE_LIBTOOL_VER=13 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} INSTALLS_SHLIB= YES diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile index 4afaf3747443..6ca4f26cc76c 100644 --- a/mail/gnarwl/Makefile +++ b/mail/gnarwl/Makefile @@ -23,7 +23,7 @@ USE_ICONV= yes USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-docdir=${DOCSDIR} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN8= damnit.8 gnarwl.8 MANCOMPRESSED= yes diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile index ab65533bd8ef..c7edb792e63b 100644 --- a/mail/ifile/Makefile +++ b/mail/ifile/Makefile @@ -17,7 +17,7 @@ COMMENT= An application of machine learning to e-mail filtering USE_GETOPT_LONG=yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN1= ifile.1 .include <bsd.port.mk> diff --git a/mail/isoqlog/Makefile b/mail/isoqlog/Makefile index 853884ae6f58..c8b1d1fc2071 100644 --- a/mail/isoqlog/Makefile +++ b/mail/isoqlog/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ofsen@enderunix.org COMMENT= A qmail, postfix, sendmail, exim MTA log analysis program GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes post-install: diff --git a/mail/isync/Makefile b/mail/isync/Makefile index 1c89d1ac57b8..5554201bfd4b 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -18,7 +18,7 @@ COMMENT= Maintain local copies of remote IMAP folders w/synchronized flags USE_GETOPT_LONG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= isync.1 diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index 5320e5da3bd0..f1fbdef4c48d 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} # require-all-recipients (implied by enable-all) is required for Balsa CONFIGURE_ARGS= --enable-all --disable-isoc diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index e789090978f3..7d5ab0662e98 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -18,7 +18,7 @@ COMMENT= A mail library USE_ICONV= yes USE_OPENSSL= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index de324b7ba758..74d35a9982f2 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -26,7 +26,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --program-transform-name=s,^spf,spf_alt, diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile index 81419234af42..7d9339a6a79c 100644 --- a/mail/libspf2-10/Makefile +++ b/mail/libspf2-10/Makefile @@ -18,6 +18,6 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile index 81419234af42..7d9339a6a79c 100644 --- a/mail/libspf2/Makefile +++ b/mail/libspf2/Makefile @@ -18,6 +18,6 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile index bb65c3151185..f6c554da9e32 100644 --- a/mail/libsrs2/Makefile +++ b/mail/libsrs2/Makefile @@ -18,6 +18,6 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/mail/lmtpd/Makefile b/mail/lmtpd/Makefile index 788d7d7531a8..bfa0f35110b2 100644 --- a/mail/lmtpd/Makefile +++ b/mail/lmtpd/Makefile @@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --without-db4 GNU_CONFIGURE= YES CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" CONFIGURE_ARGS+= --without-perl -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN8= lmtpd.8 DOCS= NEWS README TODO diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index e9bb820b88dd..fa4b270a97a9 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-syslog=1 \ --enable-use-flock=1 \ --with-etcdir="${PREFIX}/etc" \ --enable-maildirquota -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/mail/masqmail-devel/Makefile b/mail/masqmail-devel/Makefile index 45daf45260db..64bbd481d2db 100644 --- a/mail/masqmail-devel/Makefile +++ b/mail/masqmail-devel/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CFLAGS+= -Wno-trigraphs CONFIGURE_ARGS+= --mandir=${PREFIX}/man --with-user=mailnull --with-group=mail \ --with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(WITH_LIBCRYPTO) CONFIGURE_ARGS+= --with-libcrypto diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile index c123517e15ce..f79a35755e63 100644 --- a/mail/milter-greylist-devel/Makefile +++ b/mail/milter-greylist-devel/Makefile @@ -22,7 +22,7 @@ CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-user=smmsp CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LIBS="${LIBS}" diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index 7860bd8a8d55..2db5976de312 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -19,7 +19,7 @@ MAN5= greylist.conf.5 MAN8= milter-greylist.8 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-user=smmsp CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} diff --git a/mail/milter-spamc/Makefile b/mail/milter-spamc/Makefile index beb67376c51e..f634dd3ecad0 100644 --- a/mail/milter-spamc/Makefile +++ b/mail/milter-spamc/Makefile @@ -50,7 +50,7 @@ LDFLAGS+= ${PTHREAD_LIBS} DOCS= CHANGES.TXT index.shtml style.css mailto.js \ LICENSE.TXT -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--localstatedir=/var/spool .if !defined(WITH_DEBUG) diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 1f0c93adde0b..dfeda6877f0a 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -20,7 +20,7 @@ USE_GETOPT_LONG=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= msmtp.1 PLIST_FILES= bin/msmtp diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index a5555c38f88f..6fa634f1e60c 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -36,7 +36,7 @@ BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \ urlview:${PORTSDIR}/textproc/urlview .endif -.if ${MACHINE_ARCH} != "alpha" +.if ${ARCH} != "alpha" # coredump in sgmls WITH_SGML_DOCS?=yes .endif diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index a5555c38f88f..6fa634f1e60c 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -36,7 +36,7 @@ BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \ urlview:${PORTSDIR}/textproc/urlview .endif -.if ${MACHINE_ARCH} != "alpha" +.if ${ARCH} != "alpha" # coredump in sgmls WITH_SGML_DOCS?=yes .endif diff --git a/mail/renattach/Makefile b/mail/renattach/Makefile index 0881b434fd47..5bd32f254c71 100644 --- a/mail/renattach/Makefile +++ b/mail/renattach/Makefile @@ -15,7 +15,7 @@ COMMENT= Rename or remove certain attachments or kill entire messages USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= renattach.1 PORTDOCS= INSTALL diff --git a/mail/spamguard/Makefile b/mail/spamguard/Makefile index 40f5977b3b63..2452dc315e0e 100644 --- a/mail/spamguard/Makefile +++ b/mail/spamguard/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ofsen@enderunix.org COMMENT= MTA spam prevention program for qmail/postfix/sendmail GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 38cce6912064..93138ca194e1 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -72,7 +72,7 @@ CACHEOWNER?= bin # End of user variables -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-unknown-freebsd${OSREL} USE_PERL5= YES HAS_CONFIGURE= YES USE_BZIP2= YES diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile index 3b536a71b86a..8de480128b6c 100644 --- a/mail/tpop3d/Makefile +++ b/mail/tpop3d/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --enable-auth-other \ --enable-tcp-wrappers \ --enable-tls \ --with-mailspool-directory=/var/mail -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} OPTIONS= MYSQL "Use MySQL authentication" off \ PGSQL "Use PgSQL authentication" off \ diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile index e62e89914029..85d70b0a7fae 100644 --- a/mail/vqadmin/Makefile +++ b/mail/vqadmin/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail RUN_DEPENDS= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail GNU_CONFIGURE= YES -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= YES CGIBINDIR?= www/cgi-bin-dist diff --git a/math/PDL/Makefile b/math/PDL/Makefile index 66499691ab2e..48c1678ca98e 100644 --- a/math/PDL/Makefile +++ b/math/PDL/Makefile @@ -52,7 +52,7 @@ pre-extract: .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" BROKEN= test script t/flexraw.t fails all 26 tests .endif diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile index 0af4bb2dbaf9..ec3d1f20848f 100644 --- a/math/atlas-devel/Makefile +++ b/math/atlas-devel/Makefile @@ -43,11 +43,11 @@ post-patch: @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' \ -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g' \ ${WRKSRC}/config.c -.if (${MACHINE_ARCH} == "alpha") +.if (${ARCH} == "alpha") @(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch) .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${ARCH} == "sparc64" PICFLAG?= -fPIC .else PICFLAG?= -fpic diff --git a/math/atlas/Makefile b/math/atlas/Makefile index 2d15ddfb9914..fd1303f720f7 100644 --- a/math/atlas/Makefile +++ b/math/atlas/Makefile @@ -42,11 +42,11 @@ post-patch: @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' \ -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g' \ ${WRKSRC}/config.c -.if (${MACHINE_ARCH} == "alpha") +.if (${ARCH} == "alpha") @(cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/alpha-patch) .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${ARCH} == "sparc64" PICFLAG?= -fPIC .else PICFLAG?= -fpic diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile index bfaa60a3a669..9ef1efe9e537 100644 --- a/math/blitz++/Makefile +++ b/math/blitz++/Makefile @@ -26,7 +26,7 @@ MAKE_ARGS= NOPORTDOCS=yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile index b92b4717c757..1722490d7f5f 100644 --- a/math/ccmath/Makefile +++ b/math/ccmath/Makefile @@ -17,7 +17,7 @@ COMMENT= A mathematics library with many different functions INSTALLS_SHLIB= yes post-configure: -.if (${MACHINE_ARCH} != "i386") +.if (${ARCH} != "i386") (cd ${WRKSRC} && ${SH} non_intel.sh) .endif diff --git a/math/dislin/Makefile b/math/dislin/Makefile index cc31541939b3..dd17d2107dd2 100644 --- a/math/dislin/Makefile +++ b/math/dislin/Makefile @@ -9,10 +9,10 @@ PORTNAME= dislin PORTVERSION= 8.2 PORTREVISION= 1 CATEGORIES= math linux -MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/ +MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${ARCH}/ PKGNAMEPREFIX= linux- EXTRACT_SUFX= .linux.tar.gz -DIST_SUBDIR= ${MACHINE_ARCH} +DIST_SUBDIR= ${ARCH} MAINTAINER= ports@FreeBSD.org COMMENT= A scientific data plotting package @@ -26,8 +26,8 @@ NO_BUILD= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${DISLIN_DIR}/lib -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} -PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} PKGMESSAGE= ${WRKDIR}/pkg-message DISLIN_DIR= ${PREFIX}/dislin PROGRAMS= clink disaps disdrv disdrv_nw disdrv_w disgif dishlp dishpj \ diff --git a/math/fftw/Makefile b/math/fftw/Makefile index 09669bee10c1..576543679e7e 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -25,7 +25,7 @@ FFTW_SUFIX= USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --enable-shared INSTALLS_SHLIB= yes diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile index 850e54081253..f09ad478bba7 100644 --- a/math/freefem++/Makefile +++ b/math/freefem++/Makefile @@ -33,7 +33,7 @@ USE_GCC= 3.4 USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-download \ --with-blas="${LIBBLAS}" \ --with-amd="-lamd" \ diff --git a/math/freemat/Makefile b/math/freemat/Makefile index 1ec306227dd1..d646d58ad34b 100644 --- a/math/freemat/Makefile +++ b/math/freemat/Makefile @@ -30,7 +30,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack \ USE_GL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-blas="${lib_blas}" CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${THRDFLG}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${THRDLIB}" diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index 3028f31bc7b0..a6e6f46fc38f 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -17,7 +17,7 @@ COMMENT= A command-driven interactive function plotting program USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-tutorial \ --without-linux-vga \ --with-lasergnu diff --git a/math/gsl/Makefile b/math/gsl/Makefile index 7065e7f02dd9..ea312f9fdcb5 100644 --- a/math/gsl/Makefile +++ b/math/gsl/Makefile @@ -21,7 +21,7 @@ COMMENT= The GNU Scientific Library - mathematical libs INSTALLS_SHLIB= yes USE_INC_LIBTOOL_VER=13 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= MAKEINFO='makeinfo --no-split' MAN1= gsl-config.1 gsl-randist.1 gsl-histogram.1 diff --git a/math/linux-dislin/Makefile b/math/linux-dislin/Makefile index cc31541939b3..dd17d2107dd2 100644 --- a/math/linux-dislin/Makefile +++ b/math/linux-dislin/Makefile @@ -9,10 +9,10 @@ PORTNAME= dislin PORTVERSION= 8.2 PORTREVISION= 1 CATEGORIES= math linux -MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${MACHINE_ARCH}/ +MASTER_SITES= ftp://ftp.gwdg.de/pub/grafik/dislin/linux/${ARCH}/ PKGNAMEPREFIX= linux- EXTRACT_SUFX= .linux.tar.gz -DIST_SUBDIR= ${MACHINE_ARCH} +DIST_SUBDIR= ${ARCH} MAINTAINER= ports@FreeBSD.org COMMENT= A scientific data plotting package @@ -26,8 +26,8 @@ NO_BUILD= yes INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${DISLIN_DIR}/lib -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} -PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} PKGMESSAGE= ${WRKDIR}/pkg-message DISLIN_DIR= ${PREFIX}/dislin PROGRAMS= clink disaps disdrv disdrv_nw disdrv_w disgif dishlp dishpj \ diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile index b907ef08a76a..3631bcf086b0 100644 --- a/math/netcdf/Makefile +++ b/math/netcdf/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src CONFLICTS= hdf-4.* GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran" INSTALLS_SHLIB= yes diff --git a/math/orpie/Makefile b/math/orpie/Makefile index 60c509cc5e80..ec37373121f8 100644 --- a/math/orpie/Makefile +++ b/math/orpie/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= gsl.6:${PORTSDIR}/math/gsl GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 437a380a465d..5f54cfa607a7 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd USE_LIBLTDL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GDINCDIR="${LOCALBASE}/include" \ diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile index b827ea8fae09..1452fb9c9440 100644 --- a/math/sdpa/Makefile +++ b/math/sdpa/Makefile @@ -46,7 +46,7 @@ CBLAS= -lcblas -lf77blas -latlas -lg2c .if defined(WITH_OPTIMIZED_FLAGS) CFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations CXXFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar -.if (${MACHINE_ARCH} == "i386" && !${MACHINE_ARCH} == "amd64" ) +.if (${ARCH} == "i386" && !${ARCH} == "amd64" ) CFLAGS+= -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 CXXFLAGS+= -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 .endif # i386 diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile index 2bfe065c1a8e..6f43cb5af9a7 100644 --- a/math/tvmet/Makefile +++ b/math/tvmet/Makefile @@ -17,7 +17,7 @@ COMMENT= Tiny Vector and Matrix template library USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= tvmet-config.1 diff --git a/math/yacas/Makefile b/math/yacas/Makefile index 9e494e5d5c19..885e5cab35d7 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gsl.6:${PORTSDIR}/math/gsl USE_PERL5_BUILD= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 834141e1e2b7..9e11d226cc97 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -32,7 +32,7 @@ PATCH_STRIP= .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator @@ -131,7 +131,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 834141e1e2b7..9e11d226cc97 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -32,7 +32,7 @@ PATCH_STRIP= .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator @@ -131,7 +131,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 834141e1e2b7..9e11d226cc97 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -32,7 +32,7 @@ PATCH_STRIP= .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator @@ -131,7 +131,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 834141e1e2b7..9e11d226cc97 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -32,7 +32,7 @@ PATCH_STRIP= .error You have the file /usr/include/sys/scsiio.h on your system. This was removed after FreeBSD 3.5 and will break the build of this port. Please remove it. .endif -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator @@ -131,7 +131,7 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' .elif ${OSVERSION} >= 480000 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" PLIST_SUB+= SCSICHG='@comment ' .elif ${OSVERSION} >= 502000 PLIST_SUB+= SCSICHG='@comment ' diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile index f8843b5d48b5..3f09be3e2b1a 100644 --- a/misc/dejagnu/Makefile +++ b/misc/dejagnu/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= expect:${PORTSDIR}/lang/expect USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= runtest.1 diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile index e94f4523a237..1e951997776f 100644 --- a/misc/iselect/Makefile +++ b/misc/iselect/Makefile @@ -15,7 +15,7 @@ COMMENT= Interactive Selection Tool USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= iselect.1 diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile index 1f81e72484ba..03c08c672c5b 100644 --- a/misc/iso-codes/Makefile +++ b/misc/iso-codes/Makefile @@ -24,7 +24,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile index 06eb2f48bfb5..2ba94fda7906 100644 --- a/misc/kcd-devel/Makefile +++ b/misc/kcd-devel/Makefile @@ -17,7 +17,7 @@ COMMENT= Change directory in full-screen visual mode USE_GETTEXT= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile index 06eb2f48bfb5..2ba94fda7906 100644 --- a/misc/kcd/Makefile +++ b/misc/kcd/Makefile @@ -17,7 +17,7 @@ COMMENT= Change directory in full-screen visual mode USE_GETTEXT= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile index 2dcde3219c1d..1124e2c0c2ca 100644 --- a/misc/latex-mk/Makefile +++ b/misc/latex-mk/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INFO= latex-mk diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile index bc5ac57f5d57..9bc28eca7dfa 100644 --- a/misc/libhome/Makefile +++ b/misc/libhome/Makefile @@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --without-pam .endif GNU_CONFIGURE= YES -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}" home_finger MAN5= home.conf.5 diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile index c3d5e241665c..524a9dc72197 100644 --- a/misc/lifelines/Makefile +++ b/misc/lifelines/Makefile @@ -15,7 +15,7 @@ MAINTAINER= matt@gsicomp.on.ca COMMENT= An advanced genealogical system GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_ICONV= yes USE_BZIP2= yes USE_GETOPT_LONG=yes diff --git a/misc/linux-opengroupware/Makefile b/misc/linux-opengroupware/Makefile index 9a0914c8731e..fd2cf99ea8bc 100644 --- a/misc/linux-opengroupware/Makefile +++ b/misc/linux-opengroupware/Makefile @@ -11,7 +11,7 @@ CATEGORIES= misc www linux MASTER_SITES= http://download.opengroupware.org/packages/freebsd/linux-opengroupware/RPMS/:ogo \ http://download.opengroupware.org/packages/freebsd/linux-opengroupware/NGOBJWEB/:ngo \ ${MASTER_SITE_REDHAT_LINUX} -MASTER_SITE_SUBDIR= updates/8.0/en/os/${MACHINE_ARCH} +MASTER_SITE_SUBDIR= updates/8.0/en/os/${ARCH} PKGNAMEPREFIX= linux- DISTFILES= ${SET1} \ ${SET2} \ @@ -119,7 +119,7 @@ ONLY_FOR_ARCHS= i386 NO_PACKAGE= We dont really build anything ... DIST_SUBDIR= ogo PLIST= ${WRKDIR}/pkg-plist -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} PREFIX= ${LINUXBASE} .include <bsd.port.pre.mk> diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile index 36a74f7248dd..fdba9406885a 100644 --- a/misc/patchutils/Makefile +++ b/misc/patchutils/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_PERL5= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= combinediff.1 dehtmldiff.1 editdiff.1 espdiff.1 filterdiff.1 \ fixcvsdiff.1 flipdiff.1 grepdiff.1 interdiff.1 lsdiff.1 recountdiff.1 \ diff --git a/misc/sword/Makefile b/misc/sword/Makefile index 54057b5daf8e..5f820751522a 100644 --- a/misc/sword/Makefile +++ b/misc/sword/Makefile @@ -23,7 +23,7 @@ USE_GNOME= pkgconfig USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --without-conf INSTALLS_SHLIB= yes diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile index 54057b5daf8e..5f820751522a 100644 --- a/misc/sword15/Makefile +++ b/misc/sword15/Makefile @@ -23,7 +23,7 @@ USE_GNOME= pkgconfig USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --without-conf INSTALLS_SHLIB= yes diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile index 32147557d31e..67650e67fb3a 100644 --- a/misc/talkfilters/Makefile +++ b/misc/talkfilters/Makefile @@ -17,7 +17,7 @@ CONFLICTS= jive* chef* USE_LIBTOOL_VER= 15 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= talkfilters.1 wrap.1 MLINKS= talkfilters.1 austro.1 \ diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile index 08763ecab342..7088409fb4c9 100644 --- a/misc/uf-view/Makefile +++ b/misc/uf-view/Makefile @@ -20,7 +20,7 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gnomedesktop GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} USE_REINPLACE= yes pre-patch: diff --git a/misc/wmwork/Makefile b/misc/wmwork/Makefile index b50cbf3c4d1e..dd57401fa369 100644 --- a/misc/wmwork/Makefile +++ b/misc/wmwork/Makefile @@ -21,7 +21,7 @@ USE_XPM= yes USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= wmwork.1 diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile index 9595a841b012..0d6b9563a8bb 100644 --- a/misc/xdelta/Makefile +++ b/misc/xdelta/Makefile @@ -17,7 +17,7 @@ COMMENT= A diff/patch utility for binary files USE_GNOME= glib12 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} MAN1= xdelta.1 diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index ca7c5d40da4e..d0d62a7065ae 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -28,7 +28,7 @@ USE_LIBTOOL_VER=15 USE_REINPLACE= yes USE_AUTOCONF_VER=259 -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ -I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \ -I${LOCALBASE}/include/glib12" \ diff --git a/multimedia/emovix/Makefile b/multimedia/emovix/Makefile index e065e2731d7c..7fc5ef01329e 100644 --- a/multimedia/emovix/Makefile +++ b/multimedia/emovix/Makefile @@ -16,7 +16,7 @@ MAINTAINER= h.eichmann@gmx.de COMMENT= A mini linux distro to create bootable video CDs GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_PERL5= yes USE_PERL5_BUILD=yes diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 1aac2bad8b33..3b628c82b8ff 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" CONFIGURE_TARGET= -CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= kaffeine.1 MANLANG= "" de diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile index 4dfc675bec66..f7333a033ba8 100644 --- a/multimedia/kmplayer-kde4/Makefile +++ b/multimedia/kmplayer-kde4/Makefile @@ -23,7 +23,7 @@ USE_XLIB= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET= CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index 4dfc675bec66..f7333a033ba8 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -23,7 +23,7 @@ USE_XLIB= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET= CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile index 9b088c549db4..63fd47c3d920 100644 --- a/multimedia/libdvbpsi/Makefile +++ b/multimedia/libdvbpsi/Makefile @@ -18,7 +18,7 @@ COMMENT= A library for MPEG TS and DVB PSI tables decoding and generation USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-release INSTALLS_SHLIB= yes diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile index 2f5828e6a93f..944c9defad0f 100644 --- a/multimedia/libfame/Makefile +++ b/multimedia/libfame/Makefile @@ -19,7 +19,7 @@ COMMENT= A video encoding library USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN3= fame_close.3 fame_encode_frame.3 fame_get_object.3 fame_init.3 \ fame_open.3 fame_register.3 fame_unregister.3 fame_encode_slice.3 \ diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 321e9e0b7eeb..783baac87dc5 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-warnings # We must be able to build EV6 code; actual CPU-type optimizations # are chosen at runtime. -.if ${MACHINE_ARCH:L} == "alpha" +.if ${ARCH:L} == "alpha" CFLAGS:= ${CFLAGS:N-mcpu=*} .endif @@ -73,7 +73,7 @@ post-patch: @${REINPLACE_CMD} -e 's|<SDL/|<SDL11/|' ${WRKSRC}/libvo/* @${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure # AMD64 prefers position independent code -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" @${REINPLACE_CMD} -e 's|-prefer-non-pic||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile index 1fbe2da3cc97..9666de64e5f3 100644 --- a/multimedia/libmpeg3/Makefile +++ b/multimedia/libmpeg3/Makefile @@ -31,9 +31,9 @@ post-patch: do-install: .for i in mpeg3cat mpeg3dump mpeg3toc - ${INSTALL_PROGRAM} ${WRKSRC}/${MACHINE_ARCH}/${i} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${ARCH}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${WRKSRC}/${MACHINE_ARCH}/libmpeg3.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/${ARCH}/libmpeg3.a ${PREFIX}/lib .for i in libmpeg3.h mpeg3private.h ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include .endfor diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 1662a3afef31..d6257d455e5c 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -30,7 +30,7 @@ LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-ffmpeg_libs-prefix=${LOCALBASE} \ --with-libdvdread-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index 0186b5dac992..2ae3c326969c 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -89,7 +89,7 @@ CONFIGURE_ARGS+= --disable-esd PLIST_SUB+= ESDPLUGIN:="@comment " .endif -.if ${MACHINE_ARCH} != "i386" +.if ${ARCH} != "i386" WITHOUT_SIMD= yes .endif diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile index f07bd6832f8c..6d11b761f11a 100644 --- a/net-im/ari-yahoo/Makefile +++ b/net-im/ari-yahoo/Makefile @@ -18,7 +18,7 @@ COMMENT= A console Yahoo! messenger client PLIST_FILES= bin/ari-yahoo USE_GMAKE= yes USE_AUTOCONF_VER= 253 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} pre-configure: @(cd ${WRKSRC}/libyahoo && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \ diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile index d2b002c8e31b..091fbb1b8f1f 100644 --- a/net-im/climm/Makefile +++ b/net-im/climm/Makefile @@ -19,7 +19,7 @@ COMMENT= Text-based ICQ implementation USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= micq.1 diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile index 9feb3441512e..1736306ace20 100644 --- a/net-im/ickle/Makefile +++ b/net-im/ickle/Makefile @@ -27,7 +27,7 @@ USE_LIBTOOL_VER= 13 USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \ --with-gtkmm-prefix=${X11BASE} CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`" diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile index b455d51380be..af8221a713fc 100644 --- a/net-im/kf/Makefile +++ b/net-im/kf/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net/loudmouth USE_X_PREFIX= yes USE_GNOME= libglade2 USE_GETOPT_LONG= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net-im/linux-ymessenger/Makefile b/net-im/linux-ymessenger/Makefile index 2d58e7c4ff0f..4a3b94116434 100644 --- a/net-im/linux-ymessenger/Makefile +++ b/net-im/linux-ymessenger/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 1.0.4.1 CATEGORIES= net MASTER_SITES= http://download.yahoo.com/dl/unix/ PKGNAMEPREFIX= linux- -DISTNAME= rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${MACHINE_ARCH} +DISTNAME= rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${ARCH} EXTRACT_SUFX= .rpm MAINTAINER= sethk@meowfishies.com diff --git a/net-im/micq/Makefile b/net-im/micq/Makefile index d2b002c8e31b..091fbb1b8f1f 100644 --- a/net-im/micq/Makefile +++ b/net-im/micq/Makefile @@ -19,7 +19,7 @@ COMMENT= Text-based ICQ implementation USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= micq.1 diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile index 7ceda9406059..a251f94d4d1b 100644 --- a/net-im/naim/Makefile +++ b/net-im/naim/Makefile @@ -17,7 +17,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \ --mandir=${MANPREFIX}/man -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= naim.1 MLINKS= naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1 diff --git a/net-im/pork/Makefile b/net-im/pork/Makefile index 5fd6657cbd43..5ba0ce7da7ee 100644 --- a/net-im/pork/Makefile +++ b/net-im/pork/Makefile @@ -19,6 +19,6 @@ USE_GETOPT_LONG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile index 588d8466f5a8..5ac248441341 100644 --- a/net-im/sim-im/Makefile +++ b/net-im/sim-im/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(WITHOUT_SSL) USE_OPENSSL= yes diff --git a/net-im/simicq/Makefile b/net-im/simicq/Makefile index 588d8466f5a8..5ac248441341 100644 --- a/net-im/simicq/Makefile +++ b/net-im/simicq/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(WITHOUT_SSL) USE_OPENSSL= yes diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile index 6d2b7ea24032..835d0494aaf3 100644 --- a/net-mgmt/ap-utils/Makefile +++ b/net-mgmt/ap-utils/Makefile @@ -15,7 +15,7 @@ MAINTAINER= daniel+aputils@pelleg.org COMMENT= A set of utilities to configure and monitor wireless access points GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_BZIP2= yes USE_REINPLACE= yes CONFIGURE_ENV= LDFLAGS="-lintl -L${LOCALBASE}/lib" diff --git a/net-mgmt/arpscan/Makefile b/net-mgmt/arpscan/Makefile index f1c32d8fd99e..d693d951088c 100644 --- a/net-mgmt/arpscan/Makefile +++ b/net-mgmt/arpscan/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet BROKEN= Unfetchable GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/arpscan diff --git a/net-mgmt/darkstat/Makefile b/net-mgmt/darkstat/Makefile index f82ad94c408f..9d4f8c12add4 100644 --- a/net-mgmt/darkstat/Makefile +++ b/net-mgmt/darkstat/Makefile @@ -17,7 +17,7 @@ COMMENT= Network statistics gatherer, similar to ntop USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(WITHOUT_NLS) CONFIGURE_ARGS= --disable-nls diff --git a/net-mgmt/disco/Makefile b/net-mgmt/disco/Makefile index 9dfd0dd79be4..b715d8f9e1f6 100644 --- a/net-mgmt/disco/Makefile +++ b/net-mgmt/disco/Makefile @@ -16,7 +16,7 @@ COMMENT= IP discovery and fingerprinting utility GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/net-mgmt/echolot/Makefile b/net-mgmt/echolot/Makefile index e388d4664223..a05b1f38abb3 100644 --- a/net-mgmt/echolot/Makefile +++ b/net-mgmt/echolot/Makefile @@ -19,7 +19,7 @@ COMMENT= A packet sniffer that grabs ARP packets on any ethernet devices GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= echolot.1 diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile index 830a5fab6297..ca22bd200af0 100644 --- a/net-mgmt/fprobe/Makefile +++ b/net-mgmt/fprobe/Makefile @@ -15,7 +15,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Tool that collects network traffic data GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_BZIP2= yes USE_REINPLACE= yes diff --git a/net-mgmt/iftop/Makefile b/net-mgmt/iftop/Makefile index 9499208a282a..a9032c063baf 100644 --- a/net-mgmt/iftop/Makefile +++ b/net-mgmt/iftop/Makefile @@ -15,7 +15,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Network utility for real-time bandwidth usage information GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes MAN8= iftop.8 diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile index 07849245bb9b..aef37e4fcc07 100644 --- a/net-mgmt/nefu/Makefile +++ b/net-mgmt/nefu/Makefile @@ -14,7 +14,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= A network monitoring daemon GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} --disable-html diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile index e48aabf5a293..658a14e0be3e 100644 --- a/net-mgmt/nfdump-devel/Makefile +++ b/net-mgmt/nfdump-devel/Makefile @@ -15,7 +15,7 @@ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Command-line tools to collect and process NetFlow data GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1 diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile index e48aabf5a293..658a14e0be3e 100644 --- a/net-mgmt/nfdump/Makefile +++ b/net-mgmt/nfdump/Makefile @@ -15,7 +15,7 @@ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Command-line tools to collect and process NetFlow data GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/nfcapd bin/nfdump bin/nfprofile bin/nfreplay bin/nfclean.pl MAN1= nfcapd.1 nfdump.1 nfprofile.1 nfreplay.1 diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile index eafd30ee0fdd..320f5b418501 100644 --- a/net-mgmt/openvmps/Makefile +++ b/net-mgmt/openvmps/Makefile @@ -21,7 +21,7 @@ USE_RC_SUBR= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS=--bindir=${PREFIX}/sbin MAN1= vmpsd.1 diff --git a/net-mgmt/packit/Makefile b/net-mgmt/packit/Makefile index bfe1b27d6a25..59eb1b8ed01e 100644 --- a/net-mgmt/packit/Makefile +++ b/net-mgmt/packit/Makefile @@ -21,7 +21,7 @@ MAN8= packit.8 PLIST_FILES= sbin/packit GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index e9158a2cbb9e..f5f10922def8 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -36,7 +36,7 @@ CONFIGURE_ARGS+=--disable-mmap .endif GNU_CONFIGURE= yes -GNUCONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +GNUCONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GETOPT_LONG=yes diff --git a/net-mgmt/tcptrack/Makefile b/net-mgmt/tcptrack/Makefile index a36ba85b914b..783182e71529 100644 --- a/net-mgmt/tcptrack/Makefile +++ b/net-mgmt/tcptrack/Makefile @@ -15,7 +15,7 @@ MAINTAINER= squat@squat.no COMMENT= Packet sniffer which displays TCP information like top(1) GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/tcptrack MAN1= tcptrack.1 diff --git a/net-p2p/mutella/Makefile b/net-p2p/mutella/Makefile index ff2762f26c3e..5dc3a2c159d6 100644 --- a/net-p2p/mutella/Makefile +++ b/net-p2p/mutella/Makefile @@ -18,7 +18,7 @@ COMMENT= A command line Gnutella client MAN1= mutella.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile index 418101c52d92..4f8bf841038c 100644 --- a/net-p2p/opendchub/Makefile +++ b/net-p2p/opendchub/Makefile @@ -18,7 +18,7 @@ COMMENT= Unofficial Unix version of the Direct Connect Hub software USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" post-install: diff --git a/net-p2p/valknut/Makefile b/net-p2p/valknut/Makefile index a40deb89bd2a..3d96942f59c6 100644 --- a/net-p2p/valknut/Makefile +++ b/net-p2p/valknut/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libdc=${LOCALBASE} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ diff --git a/net/4g8/Makefile b/net/4g8/Makefile index ec4143cc775d..80b3f1e3c331 100644 --- a/net/4g8/Makefile +++ b/net/4g8/Makefile @@ -17,7 +17,7 @@ COMMENT= 4g8 is a tool that allows you to capture traffic BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/net/amule-devel/Makefile b/net/amule-devel/Makefile index 06fa04facbbe..6215e3df0dc4 100644 --- a/net/amule-devel/Makefile +++ b/net/amule-devel/Makefile @@ -27,7 +27,7 @@ USE_X_PREFIX= yes USE_GNOME= gnomehier gnomehack gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug \ --without-included-gettext \ --with-libintl-prefix=${LOCALBASE} \ diff --git a/net/ari-yahoo/Makefile b/net/ari-yahoo/Makefile index f07bd6832f8c..6d11b761f11a 100644 --- a/net/ari-yahoo/Makefile +++ b/net/ari-yahoo/Makefile @@ -18,7 +18,7 @@ COMMENT= A console Yahoo! messenger client PLIST_FILES= bin/ari-yahoo USE_GMAKE= yes USE_AUTOCONF_VER= 253 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} pre-configure: @(cd ${WRKSRC}/libyahoo && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} \ diff --git a/net/b2bua/Makefile b/net/b2bua/Makefile index 4f53ed977847..6efa4bfe3a58 100644 --- a/net/b2bua/Makefile +++ b/net/b2bua/Makefile @@ -32,7 +32,7 @@ BROKEN= "Does not compile on sparc64" .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.${MACHINE_ARCH}/b2bua \ + ${INSTALL_PROGRAM} ${WRKSRC}/sip/b2b/bin.nodebug.FreeBSD.${ARCH}/b2bua \ ${PREFIX}/bin ${MKDIR} ${DOCSDIR} .for file in LICENSE HOWTO HOWTO.PROV b2bdesign.pdf diff --git a/net/beacon/Makefile b/net/beacon/Makefile index 745185d87f75..f9401753d208 100644 --- a/net/beacon/Makefile +++ b/net/beacon/Makefile @@ -23,7 +23,7 @@ PLIST_SUB+= VERSION=${PORTVERSION} USE_PERL5= yes USE_AUTOCONF_VER= 259 CONFIGURE_ARGS= --bindir=${WWW_DIR}/${PORTNAME}-${PORTVERSION} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .ifdef(WITH_IPV6) #enable IPv6 name lookup, and sending IPv6 multicast diff --git a/net/bfilter/Makefile b/net/bfilter/Makefile index 3de68595aa23..65503ffb2445 100644 --- a/net/bfilter/Makefile +++ b/net/bfilter/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_RC_SUBR= yes diff --git a/net/c3270/Makefile b/net/c3270/Makefile index aced92ef1ca8..0940addc7457 100644 --- a/net/c3270/Makefile +++ b/net/c3270/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/} USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_OPENSSL= yes diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/net/dante/Makefile b/net/dante/Makefile index 455ca31a0f18..47d32583875f 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -16,7 +16,7 @@ MAINTAINER= anders@FreeBSD.org COMMENT= A circuit-level firewall/proxy GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \ --with-sockd-conf=${PREFIX}/etc/sockd.conf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index ae0da05abf91..c77799867085 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -22,7 +22,7 @@ USE_PERL5_BUILD=yes CONFIGURE_SCRIPT= Configure CONFIGURE_ENV= PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}" CONFIGURE_ARGS= -sde -Dprefix="${PREFIX}" \ - -Darchname="${MACHINE_ARCH}-freebsd" + -Darchname="${ARCH}-freebsd" INSTALL_TARGET= install install.man PORTDOCS= fwsf.ps diff --git a/net/gutenfetch/Makefile b/net/gutenfetch/Makefile index b7aff2839b3f..38ac25cb5860 100644 --- a/net/gutenfetch/Makefile +++ b/net/gutenfetch/Makefile @@ -17,7 +17,7 @@ COMMENT= Fetch listings and books from Project Gutenberg LIB_DEPENDS= gutenfetch:${PORTSDIR}/devel/libgutenfetch GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_GMAKE= yes diff --git a/net/hidentd/Makefile b/net/hidentd/Makefile index b06bc0daff32..a6f11f439e22 100644 --- a/net/hidentd/Makefile +++ b/net/hidentd/Makefile @@ -14,7 +14,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Simple and secure ident (RFC1413) server GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN8= hidentd.8 diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile index 8b4b7c2a78cc..b3a968979b56 100644 --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet \ USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ --with-pcap diff --git a/net/ickle/Makefile b/net/ickle/Makefile index 9feb3441512e..1736306ace20 100644 --- a/net/ickle/Makefile +++ b/net/ickle/Makefile @@ -27,7 +27,7 @@ USE_LIBTOOL_VER= 13 USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \ --with-gtkmm-prefix=${X11BASE} CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`" diff --git a/net/icpld/Makefile b/net/icpld/Makefile index 688c346c3b5f..b909f5dd89e0 100644 --- a/net/icpld/Makefile +++ b/net/icpld/Makefile @@ -16,7 +16,7 @@ COMMENT= Internet connection performance logging daemon USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN1= ${PORTNAME}.1 diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile index 6887b1ab10f2..c763028f543b 100644 --- a/net/ipsumdump/Makefile +++ b/net/ipsumdump/Makefile @@ -14,7 +14,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Produce ASCII summary of network traffic or tcpdump(1) file GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_PERL5_BUILD=yes USE_GMAKE= yes diff --git a/net/kf/Makefile b/net/kf/Makefile index b455d51380be..af8221a713fc 100644 --- a/net/kf/Makefile +++ b/net/kf/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= loudmouth-1.0:${PORTSDIR}/net/loudmouth USE_X_PREFIX= yes USE_GNOME= libglade2 USE_GETOPT_LONG= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/latd/Makefile b/net/latd/Makefile index 45aa3934bcf7..e78da1f6b4ff 100644 --- a/net/latd/Makefile +++ b/net/latd/Makefile @@ -15,7 +15,7 @@ MAINTAINER= tillman@seekingfire.com COMMENT= The linux-decnet project LAT protocol suite GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN1= llogin.1 MAN5= latd.conf.5 diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile index e7b1de29727d..dd0c1c53985c 100644 --- a/net/libnet-devel/Makefile +++ b/net/libnet-devel/Makefile @@ -17,7 +17,7 @@ COMMENT= A C library for creating IP packets (development version) CONFLICTS= libnet-1.* GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile index ed1b19a3c7ac..9be1fd4a8f35 100644 --- a/net/libnetdude/Makefile +++ b/net/libnetdude/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= pcapnav.0:${PORTSDIR}/net/libpcapnav USE_INC_LIBTOOL_VER= 13 USE_GNOME= glib12 -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR} INSTALLS_SHLIB= yes USE_REINPLACE= yes diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 1868e79619e8..a652b5479ab3 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-shared --disable-trace diff --git a/net/linux-ymessenger/Makefile b/net/linux-ymessenger/Makefile index 2d58e7c4ff0f..4a3b94116434 100644 --- a/net/linux-ymessenger/Makefile +++ b/net/linux-ymessenger/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 1.0.4.1 CATEGORIES= net MASTER_SITES= http://download.yahoo.com/dl/unix/ PKGNAMEPREFIX= linux- -DISTNAME= rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${MACHINE_ARCH} +DISTNAME= rh${BASEVERSION:C/([^\.])\..*/\1/}.${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/-\1/}.${ARCH} EXTRACT_SUFX= .rpm MAINTAINER= sethk@meowfishies.com diff --git a/net/micq/Makefile b/net/micq/Makefile index d2b002c8e31b..091fbb1b8f1f 100644 --- a/net/micq/Makefile +++ b/net/micq/Makefile @@ -19,7 +19,7 @@ COMMENT= Text-based ICQ implementation USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= micq.1 diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile index d0c1cdffff72..687e4c42b701 100644 --- a/net/minisapserver/Makefile +++ b/net/minisapserver/Makefile @@ -16,7 +16,7 @@ COMMENT= SAP and SLP announcement for the VLC Media Player USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes MAN1= sapserver.1 PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README diff --git a/net/mutella/Makefile b/net/mutella/Makefile index ff2762f26c3e..5dc3a2c159d6 100644 --- a/net/mutella/Makefile +++ b/net/mutella/Makefile @@ -18,7 +18,7 @@ COMMENT= A command line Gnutella client MAN1= mutella.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/net/naim/Makefile b/net/naim/Makefile index 7ceda9406059..a251f94d4d1b 100644 --- a/net/naim/Makefile +++ b/net/naim/Makefile @@ -17,7 +17,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR} \ --mandir=${MANPREFIX}/man -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= naim.1 MLINKS= naim.1 nirc.1 naim.1 nicq.1 naim.1 nlily.1 diff --git a/net/nast/Makefile b/net/nast/Makefile index ee0889a0cdaf..52e926a9ef29 100644 --- a/net/nast/Makefile +++ b/net/nast/Makefile @@ -23,7 +23,7 @@ LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet-config MAN8= nast.8 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" USE_GMAKE= yes USE_REINPLACE= yes diff --git a/net/nc6/Makefile b/net/nc6/Makefile index dd30331ddd81..a62c48fdd449 100644 --- a/net/nc6/Makefile +++ b/net/nc6/Makefile @@ -20,7 +20,7 @@ USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index d91cf38761c1..d19052d56565 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -46,7 +46,7 @@ PLIST_SUB+= TIMELORD="" PLIST_SUB+= TIMELORD="@comment " .endif USE_LIBTOOL_VER=15 -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_PERL5= yes FILES= AppleVolumes.default AppleVolumes.system afpd.conf \ diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 382f174a3a32..d528eda1ed5f 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -32,7 +32,7 @@ USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes PLIST_SUB+= DBDIR=${DBDIR} \ SHLIB=${PORTVERSION:S/.p/pre/} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DBDIR} \ --with-ossl-root=${OPENSSLBASE} \ --with-gdbm-root=${LOCALBASE} \ diff --git a/net/nylon/Makefile b/net/nylon/Makefile index 4bb76b057dba..ba14ee9d1244 100644 --- a/net/nylon/Makefile +++ b/net/nylon/Makefile @@ -21,7 +21,7 @@ RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} GNU_CONFIGURE= yes # Necessary for $PREFIX to work: -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libevent=${LOCALBASE} MAN1= nylon.1 diff --git a/net/opendchub/Makefile b/net/opendchub/Makefile index 418101c52d92..4f8bf841038c 100644 --- a/net/opendchub/Makefile +++ b/net/opendchub/Makefile @@ -18,7 +18,7 @@ COMMENT= Unofficial Unix version of the Direct Connect Hub software USE_PERL5= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" post-install: diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile index d87faeb89978..5e3b57287a47 100644 --- a/net/openldap21-server/Makefile +++ b/net/openldap21-server/Makefile @@ -232,7 +232,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ LDFLAGS+= -L${LOCALBASE}/lib #LIBS+= ${PTHREAD_LIBS} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ LIBS="${LIBS}" diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index 9fb728906ee4..7ce479d6c627 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -304,7 +304,7 @@ CPPFLAGS+= ${PTHREAD_CFLAGS} \ LDFLAGS+= -L${LOCALBASE}/lib #LIBS+= ${PTHREAD_LIBS} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ LIBS="${LIBS}" diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 46374cf75436..2dee603b7a09 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -22,7 +22,7 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/openslp \ --localstatedir=/var -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} .if defined(WITH_SLP_SECURITY) CONFIGURE_ARGS+= --enable-slpv2-security diff --git a/net/poink/Makefile b/net/poink/Makefile index 792dcf722b1c..5692fea1a38e 100644 --- a/net/poink/Makefile +++ b/net/poink/Makefile @@ -16,8 +16,8 @@ COMMENT= Nosuid, secure ping like utility USE_ZIP= yes -.if ${MACHINE_ARCH} == "sparc64" -BROKEN= "Hostname resolution broken on ${MACHINE_ARCH}" +.if ${ARCH} == "sparc64" +BROKEN= "Hostname resolution broken on ${ARCH}" .endif MAN1= poink.1 diff --git a/net/pork/Makefile b/net/pork/Makefile index 5fd6657cbd43..5ba0ce7da7ee 100644 --- a/net/pork/Makefile +++ b/net/pork/Makefile @@ -19,6 +19,6 @@ USE_GETOPT_LONG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/net/portfwd/Makefile b/net/portfwd/Makefile index 1b6104cf3d55..0a8e01768ef1 100644 --- a/net/portfwd/Makefile +++ b/net/portfwd/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A Port Forwarding Daemon GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_REINPLACE= yes diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index 501cf6d0ebba..fda0e1a848d8 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile index 501cf6d0ebba..fda0e1a848d8 100644 --- a/net/rrdtool10/Makefile +++ b/net/rrdtool10/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' CONFIGURE_ENV= PERL=${PERL} -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -fPIC LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 7ac45e1893cc..12ef8aca05f4 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -31,7 +31,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug \ --with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(WITH_POPT_PORT) CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 56b950c24abf..19d031dbc982 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -43,7 +43,7 @@ SAMBA_CONFIG= ${SAMBA_CONFDIR}/smb.conf CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \ --localstatedir=${VARDIR} \ diff --git a/net/serveez/Makefile b/net/serveez/Makefile index cbf71296e66b..dab760e236c3 100644 --- a/net/serveez/Makefile +++ b/net/serveez/Makefile @@ -27,7 +27,7 @@ USE_GETOPT_LONG= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 LIBTOOLFLAGS= --disable-ltlibs --release-ignore -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index 3b43de970939..fcad1dde7571 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -31,7 +31,7 @@ COMMENT= Secure Internet Live Conferencing (SILC) network client USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GNOME= glib12 #USE_LIBTOOL= yes USE_GMAKE= yes diff --git a/net/silky/Makefile b/net/silky/Makefile index df38e3fc9b77..4171258c3de4 100644 --- a/net/silky/Makefile +++ b/net/silky/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-silc-include=${LOCALBASE}/include/silc \ --with-silc-libs=${LOCALBASE}/lib \ --with-docdir=${DOCSDIR} \ diff --git a/net/simicq/Makefile b/net/simicq/Makefile index 588d8466f5a8..5ac248441341 100644 --- a/net/simicq/Makefile +++ b/net/simicq/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(WITHOUT_SSL) USE_OPENSSL= yes diff --git a/net/socat/Makefile b/net/socat/Makefile index b6a7236dcb1f..2643320916ed 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R:R} USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= CCOPT="${CFLAGS}" .if defined(WITHOUT_SSL) diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile index 352bac6b6bae..7acfd86a9a97 100644 --- a/net/tac_plus4/Makefile +++ b/net/tac_plus4/Makefile @@ -18,7 +18,7 @@ USE_PERL5_BUILD=yes GNU_CONFIGURE= yes USE_RC_SUBR= yes USE_REINPLACE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN5= tac_plus.conf.5 MAN8= tac_plus.8 tac_pwd.8 diff --git a/net/tacshell/Makefile b/net/tacshell/Makefile index ba81792ea217..bd7cbd83b4cc 100644 --- a/net/tacshell/Makefile +++ b/net/tacshell/Makefile @@ -14,7 +14,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Shell authentication for TACACS+ protocol GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} PORTDOCS= README WHATSNEW ChangeLog PLIST_FILES= bin/tacshell etc/tacshell.conf.sample diff --git a/net/tcpstat/Makefile b/net/tcpstat/Makefile index 8ecacda0db8e..d2a52ad0e633 100644 --- a/net/tcpstat/Makefile +++ b/net/tcpstat/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A program to report various network statistics GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= tcpstat.1 tcpprof.1 DOCS= AUTHORS ChangeLog LICENSE README doc/Tips_and_Tricks.txt diff --git a/net/trickle/Makefile b/net/trickle/Makefile index 19c4e2e21835..ebefd6adfcfb 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -21,7 +21,7 @@ INSTALLS_SHLIB= yes CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} MAN1= trickle.1 MAN5= trickled.conf.5 diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile index 8e94735471ca..c471121065e8 100644 --- a/net/tridiavnc/Makefile +++ b/net/tridiavnc/Makefile @@ -26,8 +26,8 @@ XFREE86_HTML_MAN= no .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} != i386 -BROKEN= "Does not compile on ${MACHINE_ARCH}" +.if ${ARCH} != i386 +BROKEN= "Does not compile on ${ARCH}" .endif post-patch: diff --git a/net/uplog/Makefile b/net/uplog/Makefile index b0cb79ed3bf2..127fb282dba5 100644 --- a/net/uplog/Makefile +++ b/net/uplog/Makefile @@ -18,7 +18,7 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} PORTDOCS= README PLIST_FILES= bin/uplog diff --git a/net/valknut/Makefile b/net/valknut/Makefile index a40deb89bd2a..3d96942f59c6 100644 --- a/net/valknut/Makefile +++ b/net/valknut/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libdc=${LOCALBASE} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ diff --git a/net/vomit/Makefile b/net/vomit/Makefile index 22d5c90da7e1..7c5e55ff0c0f 100644 --- a/net/vomit/Makefile +++ b/net/vomit/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent \ USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/wol/Makefile b/net/wol/Makefile index 7c30845bc4de..7ab36af7dcef 100644 --- a/net/wol/Makefile +++ b/net/wol/Makefile @@ -23,7 +23,7 @@ USE_ICONV= yes CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INFO= wol DOCS= AUTHORS NEWS README TODO diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile index 9ae940646ed4..653a01e95360 100644 --- a/news/fidogate-ds/Makefile +++ b/news/fidogate-ds/Makefile @@ -72,7 +72,7 @@ CONFIGURE_ARGS+= --libexec=${PREFIX}/libexec/fidogate \ --with-vardir=${VARDIR} \ --with-spooldir=${SPOOLDIR} \ --with-btbasedir=${BTBASEDIR} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= doc/README.ru doc/README doc/FAQ.ru doc/FIDOGATE+tracker.ru \ ChangeLog Changes.ru doc/old/FAQ_fidogate \ diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index b2187037c067..00850cc55924 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -38,7 +38,7 @@ PLIST_SUB= SPOOLDIR=${LEAFNODE_SPOOLDIR} CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/leafnode \ --with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= PKGMESSAGE= ${WRKSRC}/pkg-message diff --git a/news/multisuck/Makefile b/news/multisuck/Makefile index 240093b34b5b..ef9a1811ba43 100644 --- a/news/multisuck/Makefile +++ b/news/multisuck/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Multi-server/conn news suck GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/msuck ${PREFIX}/bin diff --git a/news/nget/Makefile b/news/nget/Makefile index 28900d9f2de4..a555256c3a82 100644 --- a/news/nget/Makefile +++ b/news/nget/Makefile @@ -18,7 +18,7 @@ COMMENT= Auto-resuming command line nntp file grabber MAN1= nget.1 ngetlite.1 MANCOMPRESSED= no GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_GETOPT_LONG= yes diff --git a/news/noffle/Makefile b/news/noffle/Makefile index 482ddd4e40c3..17263c37d03d 100644 --- a/news/noffle/Makefile +++ b/news/noffle/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--with-configfile=${LOCALBASE}/etc/noffle.conf \ --with-usersfile=${LOCALBASE}/etc/noffle.users CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} SPOOL_DIR= /var/spool/noffle PLIST_SUB+= SPOOL_DIR=${SPOOL_DIR} diff --git a/news/pyne/Makefile b/news/pyne/Makefile index f68dddb14a65..c5245b766c33 100644 --- a/news/pyne/Makefile +++ b/news/pyne/Makefile @@ -26,7 +26,7 @@ BROKEN= "Broken pkg-plist" USE_REINPLACE= yes USE_PYTHON= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ENV= PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}" ALL_TARGET= default diff --git a/news/yencode/Makefile b/news/yencode/Makefile index 7583d50bfde8..ab683a27d4b1 100644 --- a/news/yencode/Makefile +++ b/news/yencode/Makefile @@ -19,7 +19,7 @@ COMMENT= A free (GPL) encoder and decoder for the yEnc Usenet file format USE_GETOPT_LONG= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= ydecode.1 yencode.1 ypost.1 diff --git a/palm/synce-dccm/Makefile b/palm/synce-dccm/Makefile index e7fb19b0982a..8a8a2d10c5e9 100644 --- a/palm/synce-dccm/Makefile +++ b/palm/synce-dccm/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS+= synce.0:${PORTSDIR}/palm/synce-libsynce MAN1= dccm.1 synce-sound.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE} CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} USE_ICONV= yes diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile index dd2992820e9d..aa5b1f311ca2 100644 --- a/palm/synce-kde/Makefile +++ b/palm/synce-kde/Makefile @@ -29,7 +29,7 @@ USE_GMAKE= yes USE_ICONV= yes USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/HTML/en/raki diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile index 8de49b6514ed..8da98a669566 100644 --- a/palm/synce-librapi2/Makefile +++ b/palm/synce-librapi2/Makefile @@ -23,7 +23,7 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER=13 USE_ICONV= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE} CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile index a48f339cc09c..4dbda54453da 100644 --- a/palm/synce-librra/Makefile +++ b/palm/synce-librra/Makefile @@ -23,7 +23,7 @@ MAN1= synce-matchmaker.1 USE_ICONV= yes USE_LIBTOOL_VER=13 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile index 975c2198f1e6..14219dea7ccb 100644 --- a/palm/synce-libsynce/Makefile +++ b/palm/synce-libsynce/Makefile @@ -18,7 +18,7 @@ MAN1= synce.1 USE_ICONV= yes GNU_CONFIGURE= yes USE_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/palm/synce-rra/Makefile b/palm/synce-rra/Makefile index a48f339cc09c..4dbda54453da 100644 --- a/palm/synce-rra/Makefile +++ b/palm/synce-rra/Makefile @@ -23,7 +23,7 @@ MAN1= synce-matchmaker.1 USE_ICONV= yes USE_LIBTOOL_VER=13 USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/palm/synce-serial/Makefile b/palm/synce-serial/Makefile index 04206ad5806d..74e00bbf39d9 100644 --- a/palm/synce-serial/Makefile +++ b/palm/synce-serial/Makefile @@ -16,6 +16,6 @@ COMMENT= Wrapper for pppd to initiate communications with WinCE devices MAN8= synce-serial-config.8 synce-serial-start.8 synce-serial-abort.8 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/palm/synce-vdccm/Makefile b/palm/synce-vdccm/Makefile index e7fb19b0982a..8a8a2d10c5e9 100644 --- a/palm/synce-vdccm/Makefile +++ b/palm/synce-vdccm/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS+= synce.0:${PORTSDIR}/palm/synce-libsynce MAN1= dccm.1 synce-sound.1 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-libiconv=${LOCALBASE} CONFIGURE_ARGS+= --with-libsynce=${LOCALBASE} USE_ICONV= yes diff --git a/ports-mgmt/portdowngrade/Makefile b/ports-mgmt/portdowngrade/Makefile index 7ebf370b9eee..12195d6aef7f 100644 --- a/ports-mgmt/portdowngrade/Makefile +++ b/ports-mgmt/portdowngrade/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --enable-default-server=${DEFAULT_CVS_SERVER} .endif GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_BZIP2= yes diff --git a/print/cpp2latex/Makefile b/print/cpp2latex/Makefile index af270b4986a1..61622d8a2585 100644 --- a/print/cpp2latex/Makefile +++ b/print/cpp2latex/Makefile @@ -16,7 +16,7 @@ COMMENT= Convert C++ source to a file you can input in an LaTeX-document USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.pre.mk> diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile index 0e34487aafd3..41201d237365 100644 --- a/print/cups-pstoraster/Makefile +++ b/print/cups-pstoraster/Makefile @@ -30,7 +30,7 @@ USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --without-x --without-ijs --without-gimp-print \ diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common index 78374a23ccc5..41721db18c4c 100644 --- a/print/cups/Makefile.common +++ b/print/cups/Makefile.common @@ -67,7 +67,7 @@ USE_GMAKE= yes USE_PERL5_RUN= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --localstatedir=/var \ --disable-pam \ diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile index f81abd21d6da..f9a5d6fbce60 100644 --- a/print/enscript-letter/Makefile +++ b/print/enscript-letter/Makefile @@ -17,7 +17,7 @@ COMMENT= ASCII to PostScript filter GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls --with-media=${PS} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INFO= enscript MAN1= diffpp.1 enscript.1 sliceprint.1 states.1 diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index 318509578d8b..ae5880824482 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -31,7 +31,7 @@ USE_GMAKE= yes USE_XLIB= yes USE_ICONV= yes PATCH_STRIP= -l -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if !defined(FONTFORGE_NO_MULTILAYER) CONFIGURE_ARGS= --with-multilayer --with-devicetables --without-freetype-src .else diff --git a/print/gv/Makefile b/print/gv/Makefile index c703bb5984b7..2227d1f5126c 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -23,7 +23,7 @@ USE_GHOSTSCRIPT= yes USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --libdir=${PREFIX}/lib/X11 diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile index 6736f1c0b44e..c4ab5f284f96 100644 --- a/print/kaspaliste/Makefile +++ b/print/kaspaliste/Makefile @@ -20,7 +20,7 @@ USE_KDEBASE_VER= 3 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_ARGS+= --build=${ARCH}-portbld-freebsd${OSREL} \ --with-pg-includes=${LOCALBASE}/include \ --with-pg-libs=${LOCALBASE}/lib diff --git a/print/libotf/Makefile b/print/libotf/Makefile index d1368e5094cd..f311fa0fe840 100644 --- a/print/libotf/Makefile +++ b/print/libotf/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_XLIB= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .include <bsd.port.mk> diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile index e44ed2cc3e55..b84c7ecb2a26 100644 --- a/print/mftrace/Makefile +++ b/print/mftrace/Makefile @@ -31,7 +31,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes MAKEFILE= GNUmakefile PLIST= ${WRKDIR}/pkg-plist -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= mftrace.1 diff --git a/print/tipograf/Makefile b/print/tipograf/Makefile index cfa39932e848..fb6bbd56db71 100644 --- a/print/tipograf/Makefile +++ b/print/tipograf/Makefile @@ -22,7 +22,7 @@ USE_QT_VER= 3 USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-qt-dir=${QT_PREFIX} QTCPPFLAGS+= ${PTHREAD_CFLAGS} diff --git a/print/typetools/Makefile b/print/typetools/Makefile index 81375429fead..469534e39218 100644 --- a/print/typetools/Makefile +++ b/print/typetools/Makefile @@ -18,7 +18,7 @@ COMMENT= Tools for manipulating fonts BUILD_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-kpathsea=${LOCALBASE} MAN1= cfftot1.1 mmafm.1 mmpfb.1 otfinfo.1 otftotfm.1 t1dotlessj.1 \ diff --git a/russian/ksocrat/Makefile b/russian/ksocrat/Makefile index 4a5ee8e0117b..7ea91c0cac27 100644 --- a/russian/ksocrat/Makefile +++ b/russian/ksocrat/Makefile @@ -28,7 +28,7 @@ NO_CDROM= ${RESTRICTED} #NO_PACKAGE= ${RESTRICTED} ONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" post-install: diff --git a/russian/xruskb/Makefile b/russian/xruskb/Makefile index bd8168db3ff9..7406ebae0bda 100644 --- a/russian/xruskb/Makefile +++ b/russian/xruskb/Makefile @@ -18,7 +18,7 @@ USE_X_PREFIX= YES USE_BZIP2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --datadir=${PREFIX}/share -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(WITH_MOTIF) CONFIGURE_ARGS+= --with-toolkit=motif diff --git a/science/2dhf/Makefile b/science/2dhf/Makefile index c7ae2dba31a5..cd62ca647f77 100644 --- a/science/2dhf/Makefile +++ b/science/2dhf/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= lapack:${PORTSDIR}/math/lapack \ .if defined(WITH_OPTIMIZED_FLAGS) FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") FFLAGS+= -mfancy-math-387 .endif # i386 .endif diff --git a/science/buddy/Makefile b/science/buddy/Makefile index 64e0e9f0ee02..4d71df88f79b 100644 --- a/science/buddy/Makefile +++ b/science/buddy/Makefile @@ -15,7 +15,7 @@ MAINTAINER= llwang@infor.org COMMENT= A Binary Decision Diagram library USE_LIBTOOL_VER=15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile index 4356204d86da..291b511a1542 100644 --- a/science/chemtool/Makefile +++ b/science/chemtool/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_AUTOCONF_VER= 259 GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libEMF -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS+="${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-emf=yes --with-localedir=${PREFIX} diff --git a/science/dft++/Makefile b/science/dft++/Makefile index 547fc92ceca1..145136a5eae8 100644 --- a/science/dft++/Makefile +++ b/science/dft++/Makefile @@ -31,7 +31,7 @@ FFTW= -lfftw .if defined(WITH_OPTIMIZED_FLAGS) OPTIMIZED_FLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") OPTIMIZED_FLAGS+= -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3 .endif # i386 .endif diff --git a/science/getdp/Makefile b/science/getdp/Makefile index 5eb15b67b45f..50aadc7e09ed 100644 --- a/science/getdp/Makefile +++ b/science/getdp/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ lapack.3:${PORTSDIR}/math/lapack GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fftw-prefix=${LOCALBASE} \ --with-gsl-prefix=${LOCALBASE} diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index 7397bc370bc5..acad6dc1f13b 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -25,11 +25,11 @@ RUN_DEPENDS= ${LOCALBASE}/mpich/bin/mpicc:${PORTSDIR}/net/mpich USE_GMAKE= yes USE_LIBTOOL_VER= 15 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --exec-prefix=${PREFIX} -PLIST_SUB= BUILD=${MACHINE_ARCH}-portbld-freebsd${OSREL} +PLIST_SUB= BUILD=${ARCH}-portbld-freebsd${OSREL} .ifndef WITHOUT_FFTW .ifdef WITH_FLOAT diff --git a/science/kmovisto/Makefile b/science/kmovisto/Makefile index 37ee5b9ae34a..1b2695cba89d 100644 --- a/science/kmovisto/Makefile +++ b/science/kmovisto/Makefile @@ -20,7 +20,7 @@ USE_GL= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile index b907ef08a76a..3631bcf086b0 100644 --- a/science/netcdf/Makefile +++ b/science/netcdf/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src CONFLICTS= hdf-4.* GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran" INSTALLS_SHLIB= yes diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile index b907ef08a76a..3631bcf086b0 100644 --- a/science/netcdf4/Makefile +++ b/science/netcdf4/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src CONFLICTS= hdf-4.* GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran" INSTALLS_SHLIB= yes diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile index b4551b9c4d7e..14fbe3e3b36c 100644 --- a/security/barnyard/Makefile +++ b/security/barnyard/Makefile @@ -28,7 +28,7 @@ RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= AUTHORS COPYING LICENSE.QPL README docs/BUGS docs/ChangeLog \ docs/FAQ docs/INSTALL docs/NEWS docs/USAGE diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile index 90371caafa9e..57d8bc59f2a3 100644 --- a/security/beecrypt/Makefile +++ b/security/beecrypt/Makefile @@ -16,7 +16,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= BeeCrypt is an open source cryptography library GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/security/bro/Makefile b/security/bro/Makefile index 889d92229ff5..aaae8ca4b920 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-pub-${PORTVERSION}a37 USE_REINPLACE= yes GNU_CONFIGURE= yes MAKE_ENV+= CC="${CC}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --libdir=${PREFIX}/share USE_BISON= yes USE_PERL5= yes diff --git a/security/bubblegum/Makefile b/security/bubblegum/Makefile index 5218ea0dd15a..f92288708f91 100644 --- a/security/bubblegum/Makefile +++ b/security/bubblegum/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Watch a file for changes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= bubblegum.1 MANCOMPRESSED= no diff --git a/security/checkpassword-pam/Makefile b/security/checkpassword-pam/Makefile index d34593850d45..6918743af285 100644 --- a/security/checkpassword-pam/Makefile +++ b/security/checkpassword-pam/Makefile @@ -19,6 +19,6 @@ GNU_CONFIGURE= yes MAN8= checkpassword-pam.8 PLIST_FILES= bin/checkpassword-pam -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index ab5cb27b3742..496df9ca852d 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -27,7 +27,7 @@ OPTIONS= MILTER "Compile the milter interface" Off \ CURL "Support URL downloading" Off USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_AUTOCONF_VER=259 USE_AUTOMAKE_VER=19 USE_LIBTOOL_VER=15 diff --git a/security/clamav/Makefile b/security/clamav/Makefile index a5f35cbb9c49..3ac777f5d4f0 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -29,7 +29,7 @@ OPTIONS= MILTER "Compile the milter interface" Off \ CURL "Support URL downloading" Off USE_REINPLACE= yes USE_LIBTOOL_VER=15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes USE_RC_SUBR= yes diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/security/courier-authlib-base/Makefile +++ b/security/courier-authlib-base/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 902b25be6031..96eb0a2976ab 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --without-authshadow \ --without-authcustom \ diff --git a/security/digest/Makefile b/security/digest/Makefile index 1d57d3495ad1..e7df4608c390 100644 --- a/security/digest/Makefile +++ b/security/digest/Makefile @@ -24,7 +24,7 @@ MAN1?= ${PORTNAME}.1 PLIST_FILES?= bin/${PORTNAME} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.pre.mk> diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile index 2a9f9d490cc9..8d13958969ee 100644 --- a/security/fakeroot/Makefile +++ b/security/fakeroot/Makefile @@ -17,7 +17,7 @@ COMMENT= Simulate the root user behaviour USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MANLANG= "" es sv diff --git a/security/fcrackzip/Makefile b/security/fcrackzip/Makefile index 8f7d8a747435..5f8650278b0f 100644 --- a/security/fcrackzip/Makefile +++ b/security/fcrackzip/Makefile @@ -14,7 +14,7 @@ MAINTAINER= sw@gegenunendlich.de COMMENT= Portable, fast and featureful ZIP password cracker GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG=yes USE_PERL5_BUILD=yes USE_REINPLACE= yes diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 1d15b2da2af8..fc801095ae97 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -20,9 +20,9 @@ COMMENT= The GNU Privacy Guard USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_TARGET= --build ${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build ${ARCH}-portbld-freebsd${OSREL} .if ${MACHINE_CPU:Mi586} -MACHINE_ARCH= i586 +ARCH= i586 .endif CFLAGS:= ${CFLAGS:S/-pipe//g} .if !defined(WITHOUT_NLS) diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index 1d15b2da2af8..fc801095ae97 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -20,9 +20,9 @@ COMMENT= The GNU Privacy Guard USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_TARGET= --build ${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build ${ARCH}-portbld-freebsd${OSREL} .if ${MACHINE_CPU:Mi586} -MACHINE_ARCH= i586 +ARCH= i586 .endif CFLAGS:= ${CFLAGS:S/-pipe//g} .if !defined(WITHOUT_NLS) diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile index ab902bddca0b..80b5d02ee1b7 100644 --- a/security/gnutls-devel/Makefile +++ b/security/gnutls-devel/Makefile @@ -33,7 +33,7 @@ INSTALLS_SHLIB= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-included-lzo MAN1= certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \ diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 90009b1249c8..5afa81d63fee 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -42,7 +42,7 @@ INSTALLS_SHLIB= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-included-lzo MAN1= certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \ diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 4be43f2dff32..142c3d7fa6cd 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -22,7 +22,7 @@ USE_LIBTOOL_VER=15 USE_GMAKE= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-gpg=${LOCALBASE}/bin/gpg \ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ --includedir=${PREFIX}/include/gpgme diff --git a/security/hashish/Makefile b/security/hashish/Makefile index 04169d08199d..5be705d816ea 100644 --- a/security/hashish/Makefile +++ b/security/hashish/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 .endif GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITH_GTK1) diff --git a/security/libbf/Makefile b/security/libbf/Makefile index 1c27cae2602f..3c78d28ad4a7 100644 --- a/security/libbf/Makefile +++ b/security/libbf/Makefile @@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/libeay/ \ MAINTAINER= jim@corebsd.or.id COMMENT= The Blowfish block cipher Library -.if ${MACHINE_ARCH} == "i386" +.if ${ARCH} == "i386" MAKEFLAGS+= BF_ENC=asm/bx86-elf.o .else MAKEFLAGS+= BF_ENC=bf_enc.o diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index 1605da36ab87..e71fd21be72e 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -20,7 +20,7 @@ SIG_SUFFIX= .sig USE_INC_LIBTOOL_VER= 15 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(WITHOUT_NLS) CONFIGURE_ARGS= --without-nls diff --git a/security/libksba/Makefile b/security/libksba/Makefile index 6c3708e344bc..f98bab7d18f8 100644 --- a/security/libksba/Makefile +++ b/security/libksba/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_INC_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} USE_PERL5_BUILD=yes INFO= ksba diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile index 4e6dedb83e33..bd591f573abc 100644 --- a/security/libmcrypt/Makefile +++ b/security/libmcrypt/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Multi-cipher cryptographic library (used in PHP) GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-static INSTALLS_SHLIB= yes diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile index 48a5e55cbe43..054862a8541f 100644 --- a/security/libprelude/Makefile +++ b/security/libprelude/Makefile @@ -16,7 +16,7 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER= 13 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc --localstatedir=/var .if defined(WITHOUT_SSL) diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile index b4e62aeaa0e2..d5ad6a7639d8 100644 --- a/security/libtasn1/Makefile +++ b/security/libtasn1/Makefile @@ -22,7 +22,7 @@ SIG_SUFFIX= .sig INSTALLS_SHLIB= yes USE_LIBTOOL_VER= 15 USE_GETOPT_LONG= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= AUTHORS NEWS README THANKS doc/TODO \ doc/libtasn1.html doc/libtasn1.pdf doc/libtasn1.ps diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile index d9d479c92f86..36fd5e19bef1 100644 --- a/security/mcrypt/Makefile +++ b/security/mcrypt/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static --with-catgets CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} GNU_CONFIGURE= yes DOCS= FORMAT magic MAN1= mcrypt.1 diff --git a/security/mhash/Makefile b/security/mhash/Makefile index 900686aa70eb..16129d909ca7 100644 --- a/security/mhash/Makefile +++ b/security/mhash/Makefile @@ -16,7 +16,7 @@ COMMENT= An easy-to-use library for strong hashes such as MD5 and SHA1 INSTALLS_SHLIB= yes USE_LIBTOOL_VER=13 -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-LDFLAGS="${PTHREAD_LIBS}" --enable-static \ --with-gnu-ld diff --git a/security/nmap/Makefile b/security/nmap/Makefile index e46747324a2d..b5b35de4e3dd 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -25,7 +25,7 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-localdirs -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .ifndef BUILD_NMAPFE diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile index 7672b3c26882..f3ee703388ed 100644 --- a/security/oidentd/Makefile +++ b/security/oidentd/Makefile @@ -18,7 +18,7 @@ COMMENT= Ident server that supports user-defined ident strings USE_RC_SUBR= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN5= oidentd.conf.5 oidentd_masq.conf.5 MAN8= oidentd.8 diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile index b8a5249c8805..4e27a385e53b 100644 --- a/security/opencdk/Makefile +++ b/security/opencdk/Makefile @@ -26,7 +26,7 @@ SIG_SUFFIX= .sig.asc USE_BZIP2= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE} USE_REINPLACE= yes diff --git a/security/osiris/Makefile b/security/osiris/Makefile index d1f16329eaf5..cb9282342b61 100644 --- a/security/osiris/Makefile +++ b/security/osiris/Makefile @@ -19,7 +19,7 @@ OPTIONS= OSIRISMD "Enable to build the management daemon" off \ CLI "Enable to build the management CLI" off GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} \ --enable-fancy-cli USE_LIBTOOL_VER= 15 USE_RC_SUBR= yes diff --git a/security/pam_ldap/Makefile b/security/pam_ldap/Makefile index a620f2d2ad96..20a81023b0b9 100644 --- a/security/pam_ldap/Makefile +++ b/security/pam_ldap/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-ldap-lib=openldap \ --with-ldap-dir=${LOCALBASE} \ --with-ldap-conf-file=${PREFIX}/etc/ldap.conf \ --with-ldap-secret-file=${PREFIX}/etc/ldap.secret -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-unknown-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/security/pgp/Makefile b/security/pgp/Makefile index 28afa6d34027..e4adda2d1835 100644 --- a/security/pgp/Makefile +++ b/security/pgp/Makefile @@ -19,7 +19,7 @@ COMMENT= PGP International version - Public-Key encryption for the masses WRKSRC= ${WRKDIR}/src MAKEFILE= makefile -ALL_TARGET= freebsd-${MACHINE_ARCH} +ALL_TARGET= freebsd-${ARCH} MAKE_ENV= PREFIX="${PREFIX}" OS_CFLAGS="${CFLAGS}" PGPLIB= ${PREFIX}/share/pgp MAN1= pgp.1 pgp2.1 diff --git a/security/pgpin/Makefile b/security/pgpin/Makefile index 41add2b2748e..dba05071a666 100644 --- a/security/pgpin/Makefile +++ b/security/pgpin/Makefile @@ -18,7 +18,7 @@ COMMENT= PGP International version - improved for use in IN-CA WRKSRC= ${WRKDIR}/pgp263in/src MAKEFILE= makefile -ALL_TARGET= freebsd-${MACHINE_ARCH} OS_CFLAGS="${CFLAGS}" +ALL_TARGET= freebsd-${ARCH} OS_CFLAGS="${CFLAGS}" PGPLIB= ${PREFIX}/lib/pgpin MAN1= pgpin.1 diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index 49955e32692a..a9cd6de93c3a 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS+= prelude.1:${PORTSDIR}/security/libprelude \ USE_GMAKE= yes USE_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include <bsd.port.mk> diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index 4e89bd7a8d76..a2bc47677bb9 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS+= prelude.1:${PORTSDIR}/security/libprelude \ USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --localstatedir=/var diff --git a/security/prelude-nids/Makefile b/security/prelude-nids/Makefile index b905a2dd689f..d06b814502fd 100644 --- a/security/prelude-nids/Makefile +++ b/security/prelude-nids/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= prelude.1:${PORTSDIR}/security/libprelude USE_GMAKE= yes USE_LIBTOOL_VER= 13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --prefix=${PREFIX} \ --with-html-dir=${PREFIX}/share/doc diff --git a/security/snort/Makefile b/security/snort/Makefile index 18034c289e6f..7f195edbcd4d 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -29,7 +29,7 @@ USE_RC_SUBR= yes RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN8= snort.8 DOCS= ChangeLog doc/AUTHORS doc/BUGS doc/CREDITS doc/NEWS \ diff --git a/security/steghide/Makefile b/security/steghide/Makefile index 177711344081..74dc64afb5a9 100644 --- a/security/steghide/Makefile +++ b/security/steghide/Makefile @@ -25,7 +25,7 @@ USE_LIBTOOL_VER=13 GNU_CONFIGURE= yes USE_GCC= 3.4 CONFIGURE_TARGET= -CONFIGURE_ARGS= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt" diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 7330326347b9..cc8576911902 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -21,7 +21,7 @@ USE_LIBTOOL_VER= 15 USE_RC_SUBR= YES GNU_CONFIGURE= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var/tmp --with-pem-dir=${PEM_DIR} \ --enable-static diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index dc79814d0fd6..f30b70571e64 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -17,7 +17,7 @@ COMMENT= An anonymizing overlay network for TCP RUN_DEPENDS= tsocks:${PORTSDIR}/net/tsocks GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_OPENSSL= yes USE_REINPLACE= yes diff --git a/security/tor/Makefile b/security/tor/Makefile index dc79814d0fd6..f30b70571e64 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -17,7 +17,7 @@ COMMENT= An anonymizing overlay network for TCP RUN_DEPENDS= tsocks:${PORTSDIR}/net/tsocks GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_OPENSSL= yes USE_REINPLACE= yes diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile index 06f868d773a6..2ed6cad26d96 100644 --- a/security/xmlsec/Makefile +++ b/security/xmlsec/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} USE_OPENSSL= yes USE_GNOME= gnomehack libxslt USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes MAN1= xmlsec.1 xmlsec-config.1 diff --git a/security/yafic/Makefile b/security/yafic/Makefile index 8879fbd6363c..6d7a45fbb9dd 100644 --- a/security/yafic/Makefile +++ b/security/yafic/Makefile @@ -16,7 +16,7 @@ MAINTAINER= allan@saddi.com COMMENT= Yet Another File Integrity Checker, similar to Tripwire GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CONFIGURE_ENV= LDFLAGS="-static" diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 276c203e2937..e6ae1fa86f11 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -25,7 +25,7 @@ PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S/.//g}-0${patch}:bash PATCHLEVEL= ${patch} .endfor -MAINTAINER= eik@FreeBSD.org +MAINTAINER= eik@FreeBSD.org, obrien@FreeBSD.org COMMENT= The GNU Project's Bourne Again SHell IGNOREFILES= FAQ @@ -53,6 +53,7 @@ PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH .endif CONFIGURE_ARGS= --without-bash-malloc \ + --with-installed-readline \ --disable-rpath \ --enable-disabled-builtins @@ -74,7 +75,7 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CPPFLAGS+= ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile index 4333956efb09..72c7949e2cd9 100644 --- a/shells/zsh-devel/Makefile +++ b/shells/zsh-devel/Makefile @@ -63,7 +63,7 @@ CONFLICTS= zsh-4.0.* USE_BZIP2= yes GNU_CONFIGURE= yes -#CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +#CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-etcdir=${ZSH_ETCDIR} --with-curses-terminfo \ --enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \ --enable-site-fndir=${ZSH_SITEFNDIR} diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 29b58a2b1572..c127f88a8a42 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -60,7 +60,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-curses-terminfo --with-tcsetpgrp \ --enable-etcdir=${ZSH_ETCDIR} \ --enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \ diff --git a/sysutils/aaccli/Makefile b/sysutils/aaccli/Makefile index 263a947a4742..b563ea668dde 100644 --- a/sysutils/aaccli/Makefile +++ b/sysutils/aaccli/Makefile @@ -22,8 +22,8 @@ RESTRICTED= "May not be redistributed in binary form" NO_CDROM= yes ONLY_FOR_ARCHS= i386 -PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/sysutils/anteater/Makefile b/sysutils/anteater/Makefile index 998821e00f51..2511af830e05 100644 --- a/sysutils/anteater/Makefile +++ b/sysutils/anteater/Makefile @@ -17,7 +17,7 @@ COMMENT= A MTA log analyzer USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= anteater.1 PLIST_FILES= bin/anteater diff --git a/sysutils/ccd2iso/Makefile b/sysutils/ccd2iso/Makefile index c18d17fadcf7..550cefe2a861 100644 --- a/sysutils/ccd2iso/Makefile +++ b/sysutils/ccd2iso/Makefile @@ -19,7 +19,7 @@ COMMENT= A CloneCD to ISO converter PLIST_FILES= bin/ccd2iso GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ccd2iso ${PREFIX}/bin diff --git a/sysutils/cdf/Makefile b/sysutils/cdf/Makefile index 5be3114d2f7f..09be552c560f 100644 --- a/sysutils/cdf/Makefile +++ b/sysutils/cdf/Makefile @@ -16,6 +16,6 @@ COMMENT= A colorized df PLIST_FILES= bin/cdf GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile index bad9c0f2275e..5bb269d7c967 100644 --- a/sysutils/cfengine2/Makefile +++ b/sysutils/cfengine2/Makefile @@ -17,7 +17,7 @@ COMMENT= A systems administration tool for networks USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-berkeleydb=${LOCALBASE} --with-docs USE_REINPLACE= yes diff --git a/sysutils/dump9660/Makefile b/sysutils/dump9660/Makefile index 102a8029de03..3a3366e83d59 100644 --- a/sysutils/dump9660/Makefile +++ b/sysutils/dump9660/Makefile @@ -21,7 +21,7 @@ MLINKS= mk9660.8 dump9660.8 USE_REINPLACE= yes ONLY_FOR_ARCHS= alpha i386 powerpc -OBJTYPE= ${MACHINE_ARCH:S/i386/386/:S/powerpc/power/} +OBJTYPE= ${ARCH:S/i386/386/:S/powerpc/power/} MAKE_ENV= systype=${OPSYS} objtype=${OBJTYPE} post-patch: diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 633406fa4166..c43c92170620 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -17,7 +17,7 @@ USE_AUTOMAKE_VER= 19 USE_AUTOCONF_VER= 259 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-freebsd-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-freebsd-freebsd${OSREL} ONLY_FOR_ARCHS= i386 GRUB_DIR= ${DATADIR:C|^${PREFIX}/||}/i386-freebsd diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile index eb87ddb37ec6..083cb5cb54a3 100644 --- a/sysutils/hdup/Makefile +++ b/sysutils/hdup/Makefile @@ -28,7 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= glib20 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_AUTOCONF_VER= 259 MAN1= hdup.1 diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile index cb337844ed6e..81a665d21f66 100644 --- a/sysutils/hourglass/Makefile +++ b/sysutils/hourglass/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= jgraph:${PORTSDIR}/graphics/jgraph USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/busy bin/hourglass PORTDOCS= CALIBRATION diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index 41f779f450e0..38a2269d93b2 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} # On FreeBSD only lan and lanplus interfaces are supported at this time CONFIGURE_ARGS+= --enable-intf-lan --enable-intf-lanplus \ --disable-intf-open --disable-intf-imb --disable-intf-lipmi diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index 8ae0298cd218..06b764a7bbd8 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad \ USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-k3bsetup=no USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index 8ae0298cd218..06b764a7bbd8 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= mad:${PORTSDIR}/audio/libmad \ USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-k3bsetup=no USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile index 319d1eec68d3..8376651b9fc6 100644 --- a/sysutils/linux-afaapps/Makefile +++ b/sysutils/linux-afaapps/Makefile @@ -11,7 +11,7 @@ PORTREVISION= 3 CATEGORIES= sysutils linux MASTER_SITES= ftp://ftp.us.dell.com/scsi-raid/ PKGNAMEPREFIX= linux- -DISTNAME= aacraid-util-rh8.0-${MACHINE_ARCH} +DISTNAME= aacraid-util-rh8.0-${ARCH} MAINTAINER= bms@FreeBSD.org COMMENT= DELL PowerEdge Raid Controller 2 (apps) @@ -32,10 +32,10 @@ LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig ONLY_FOR_ARCHS= i386 NO_FILTER_SHLIBS= yes -PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +PLIST= ${MASTERDIR}/pkg-plist.${ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} -RPMFILE= ${PORTNAME}-${PORTVERSION}-2.${MACHINE_ARCH}.rpm +RPMFILE= ${PORTNAME}-${PORTVERSION}-2.${ARCH}.rpm DBPATH= /var/lib/rpm RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ diff --git a/sysutils/lookat/Makefile b/sysutils/lookat/Makefile index 2bb31670f08b..10846871441f 100644 --- a/sysutils/lookat/Makefile +++ b/sysutils/lookat/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Lookat is a program to view Un*x text files and manual pages GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_REINPLACE= yes diff --git a/sysutils/metalog/Makefile b/sysutils/metalog/Makefile index 973e34252390..c3ff5f2086f7 100644 --- a/sysutils/metalog/Makefile +++ b/sysutils/metalog/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} # Needed for metalog's configure to find installed devel/pcre port CPPFLAGS+= -I${LOCALBASE}/include diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile index a8d2028d702e..9ffaeca826f5 100644 --- a/sysutils/ntfsprogs/Makefile +++ b/sysutils/ntfsprogs/Makefile @@ -22,7 +22,7 @@ USE_GETOPT_LONG= yes USE_INC_LIBTOOL_VER= 13 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} OPTIONS= GNOMEVFS2 "Install Gnome-VFS-2.0 libntfs interface" off diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile index 125c914fb0c2..3386b7d6d99b 100644 --- a/sysutils/nvtv/Makefile +++ b/sysutils/nvtv/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pci.2:${PORTSDIR}/devel/libpci ONLY_FOR_ARCHS= i386 CONFIGURE_ENV= CC="${CC} -I${PREFIX}/include" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 USE_GETOPT_LONG= yes diff --git a/sysutils/pipemeter/Makefile b/sysutils/pipemeter/Makefile index b76908e311c1..e20b3fd381f0 100644 --- a/sysutils/pipemeter/Makefile +++ b/sysutils/pipemeter/Makefile @@ -15,7 +15,7 @@ MAINTAINER= rabbi@abditum.com COMMENT= Measure speed of data going through a pipe GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= pipemeter.1 PORTDOCS= Changelog README diff --git a/sysutils/portdowngrade/Makefile b/sysutils/portdowngrade/Makefile index 7ebf370b9eee..12195d6aef7f 100644 --- a/sysutils/portdowngrade/Makefile +++ b/sysutils/portdowngrade/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --enable-default-server=${DEFAULT_CVS_SERVER} .endif GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_BZIP2= yes diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile index 46e5053a0342..dabc72fd216c 100644 --- a/sysutils/progsreiserfs/Makefile +++ b/sysutils/progsreiserfs/Makefile @@ -22,7 +22,7 @@ USE_GETOPT_LONG=yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --disable-debug .if defined(WITHOUT_NLS) diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile index c26cd5cdb68d..7d4a9fd80557 100644 --- a/sysutils/rsnapshot/Makefile +++ b/sysutils/rsnapshot/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= rsnapshot.1 DOCS= AUTHORS ChangeLog README TODO diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile index 0b3c7924d1bd..db45b3993648 100644 --- a/sysutils/sdd/Makefile +++ b/sysutils/sdd/Makefile @@ -18,14 +18,14 @@ MAN1= sdd.1 .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc" +.if ${ARCH} != "i386" || ${CC} != "cc" post-extract: @${LN} -sf i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul + ${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${MACHINE_ARCH}-freebsd-${CC}/sdd \ + ${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${ARCH}-freebsd-${CC}/sdd \ ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/sdd/sdd.1 ${PREFIX}/man/man1 diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile index 69fd570cf759..e1321e9fa2eb 100644 --- a/sysutils/smartmontools-devel/Makefile +++ b/sysutils/smartmontools-devel/Makefile @@ -20,7 +20,7 @@ USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-initscriptdir=${PREFIX}/etc/rc.d \ --with-docdir=${DOCSDIR} --enable-sample -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PROGRAMS= smartctl smartd MAN5= smartd.conf.5 diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 69fd570cf759..e1321e9fa2eb 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -20,7 +20,7 @@ USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-initscriptdir=${PREFIX}/etc/rc.d \ --with-docdir=${DOCSDIR} --enable-sample -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PROGRAMS= smartctl smartd MAN5= smartd.conf.5 diff --git a/sysutils/srmt/Makefile b/sysutils/srmt/Makefile index dfb610f55727..ae051ed02f80 100644 --- a/sysutils/srmt/Makefile +++ b/sysutils/srmt/Makefile @@ -22,9 +22,9 @@ MAKE_ENV= MAKEPROG=${GMAKE} CCOM=${CC} MAN1= srmt.1 post-extract: -.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc" +.if ${ARCH} != "i386" || ${CC} != "cc" @${LN} -sf i386-freebsd-cc.rul \ - ${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul + ${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul .endif post-patch: @@ -34,7 +34,7 @@ post-patch: do-install: @${INSTALL_PROGRAM} \ - ${WRKSRC}/rmt/OBJ/${MACHINE_ARCH}-freebsd-${CC}/rmt \ + ${WRKSRC}/rmt/OBJ/${ARCH}-freebsd-${CC}/rmt \ ${PREFIX}/sbin/srmt @${INSTALL_MAN} ${WRKSRC}/rmt/rmt.1 ${MANPREFIX}/man/man1/srmt.1 @${INSTALL_DATA} ${WRKSRC}/rmt/rmt.dfl ${PREFIX}/etc/srmt.conf.dist diff --git a/sysutils/stress/Makefile b/sysutils/stress/Makefile index 772e781d9a07..a935601b325d 100644 --- a/sysutils/stress/Makefile +++ b/sysutils/stress/Makefile @@ -14,7 +14,7 @@ MAINTAINER= setagllib@optusnet.com.au COMMENT= Tool to impose load on and stress test Unix-like systems GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build ${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build ${ARCH}-portbld-freebsd${OSREL} INFO= stress MAN1= stress.1 diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile index f4e37a693733..f72736961240 100644 --- a/sysutils/synergy/Makefile +++ b/sysutils/synergy/Makefile @@ -16,7 +16,7 @@ COMMENT= Mouse and keyboard sharing utility GNU_CONFIGURE= yes USE_X_PREFIX= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile index 4c8c5cb0ad4a..2516cf3db3ca 100644 --- a/sysutils/testdisk/Makefile +++ b/sysutils/testdisk/Makefile @@ -15,7 +15,7 @@ COMMENT= Tool to check and undelete partitions GNU_CONFIGURE= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib" MAN1= testdisk.1 photorec.1 diff --git a/sysutils/uptimec/Makefile b/sysutils/uptimec/Makefile index 6633e4a00d12..82048463aede 100644 --- a/sysutils/uptimec/Makefile +++ b/sysutils/uptimec/Makefile @@ -18,7 +18,7 @@ USE_RC_SUBR= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= sbin/uptimec etc/uptimecrc.sample etc/rc.d/uptimec.sh PORTDOCS= README ChangeLog INSTALL protocol.txt diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile index 74f19d629d35..e9bb549317c8 100644 --- a/sysutils/userinfo/Makefile +++ b/sysutils/userinfo/Makefile @@ -14,7 +14,7 @@ MAINTAINER= bjk@m-net.arbornet.org COMMENT= Show information about local users GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= ui.1 PLIST_FILES= bin/ui diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile index 02798363fdea..a0694f0f1ba6 100644 --- a/sysutils/wmfsm/Makefile +++ b/sysutils/wmfsm/Makefile @@ -17,7 +17,7 @@ USE_X_PREFIX= yes USE_XPM= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= wmfsm.1 diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile index d488c0b5e734..dfd155c4752b 100644 --- a/sysutils/xvidcap/Makefile +++ b/sysutils/xvidcap/Makefile @@ -21,7 +21,7 @@ COMMENT= Capture your X display to individual frames or MPEG video RUN_DEPENDS= animate:${PORTSDIR}/graphics/ImageMagick GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} #CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ # LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --with-forced-embedded-ffmpeg # To be removed after 1.1.4pre2? diff --git a/textproc/aft/Makefile b/textproc/aft/Makefile index 06dc4df09d81..4e4148743131 100644 --- a/textproc/aft/Makefile +++ b/textproc/aft/Makefile @@ -16,7 +16,7 @@ COMMENT= A document preparation system using an Almost Free Text input format USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= -build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= -build=${ARCH}-portbld-freebsd${OSREL} .if defined(NOPORTDOCS) INSTALL_TARGET= install-binSCRIPTS install-pkgdataDATA install-pkgdataSCRIPTS diff --git a/textproc/dbacl/Makefile b/textproc/dbacl/Makefile index 7d817ef6eb89..554b124ef1b2 100644 --- a/textproc/dbacl/Makefile +++ b/textproc/dbacl/Makefile @@ -17,7 +17,7 @@ COMMENT= Digramic Bayesian classifier RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes PROGRAMS= bayesol dbacl mailinspect diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile index 11e5e3e3425e..13c409d31185 100644 --- a/textproc/dictfmt/Makefile +++ b/textproc/dictfmt/Makefile @@ -18,7 +18,7 @@ COMMENT= Formats a DICT protocol dictionary database USE_GETOPT_LONG= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-cflags="${CFLAGS}" ALL_TARGET= dictfmt diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile index ebb2b73cf8c5..b4d352910076 100644 --- a/textproc/docbook-to-man/Makefile +++ b/textproc/docbook-to-man/Makefile @@ -23,7 +23,7 @@ COMMENT= A DocBook SGML DTD into nroff/troff -man macros converter # Jade is preferred, but it currently doesn't compile on 2.1.x # system, so use sp in that case. -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" WITH_OPENJADE= yes .endif diff --git a/textproc/filepp/Makefile b/textproc/filepp/Makefile index 5bec960b3175..130e82c731fd 100644 --- a/textproc/filepp/Makefile +++ b/textproc/filepp/Makefile @@ -16,7 +16,7 @@ COMMENT= A generic file preprocessor USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} NO_BUILD= yes MAN1= filepp.1 diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile index a9cb6c3257ca..8d6ec4ef2498 100644 --- a/textproc/gmetadom/Makefile +++ b/textproc/gmetadom/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig USE_GNOME= glib20 gnomehack libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index 0a1f98256417..998ee7f0d027 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -21,7 +21,7 @@ COMMENT= The GNU stream editor USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --disable-nls USE_GMAKE= yes diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile index 7c6afae66fab..3aa506560353 100644 --- a/textproc/gxmlviewer/Makefile +++ b/textproc/gxmlviewer/Makefile @@ -27,7 +27,7 @@ USE_GNOME= gnomelibs bonobo gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index 67408b25a711..3dbf6f110167 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -29,7 +29,7 @@ USE_AUTOHEADER_VER= 259 USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 8313328bbdd9..1344361d31a2 100644 --- a/textproc/iiimf-csconv/Makefile +++ b/textproc/iiimf-csconv/Makefile @@ -28,7 +28,7 @@ USE_AUTOCONF_VER= 259 WANT_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile index 7eb9393f5e33..fc128471ce3d 100644 --- a/textproc/iiimf-gnome-im-switcher/Makefile +++ b/textproc/iiimf-gnome-im-switcher/Makefile @@ -34,7 +34,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile index 148bfd8183eb..854db3c08196 100644 --- a/textproc/iiimf-gtk/Makefile +++ b/textproc/iiimf-gtk/Makefile @@ -34,7 +34,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index 6ecae1ae7565..b4ae3f417d29 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -31,7 +31,7 @@ USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 AUTOMAKE_ARGS+= --add-missing -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index a56549379441..a587b03885f1 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -27,7 +27,7 @@ USE_AUTOHEADER_VER= 259 USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index 4c372a952c09..3f66ee126e2a 100644 --- a/textproc/iiimf-server/Makefile +++ b/textproc/iiimf-server/Makefile @@ -31,7 +31,7 @@ USE_AUTOHEADER_VER= 259 USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index 2363398e7ba8..f43475ccd3ba 100644 --- a/textproc/iiimf-x-lib/Makefile +++ b/textproc/iiimf-x-lib/Makefile @@ -33,7 +33,7 @@ USE_AUTOHEADER_VER= 259 USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index 7a82a8f54d8f..afac1c19867e 100644 --- a/textproc/iiimf-x/Makefile +++ b/textproc/iiimf-x/Makefile @@ -31,7 +31,7 @@ USE_AUTOHEADER_VER= 259 USE_AUTOMAKE_VER= 19 WANT_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/htt_xbe PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} diff --git a/textproc/ipdf/Makefile b/textproc/ipdf/Makefile index ba237e298fd4..02734b9fbbc9 100644 --- a/textproc/ipdf/Makefile +++ b/textproc/ipdf/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pdf.7:${PORTSDIR}/print/pdflib \ tiff.4:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/libhtmlparse/Makefile b/textproc/libhtmlparse/Makefile index d9b8ceee825b..a428544f09c8 100644 --- a/textproc/libhtmlparse/Makefile +++ b/textproc/libhtmlparse/Makefile @@ -17,6 +17,6 @@ USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile index 10f91668f74a..881b604e8a36 100644 --- a/textproc/libparsifal/Makefile +++ b/textproc/libparsifal/Makefile @@ -16,7 +16,7 @@ COMMENT= Lightweight XML Parser USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes PLIST_SUB= VERSION=${PORTVERSION} diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile index b6117496112b..b7f9137dbdd2 100644 --- a/textproc/libpathan/Makefile +++ b/textproc/libpathan/Makefile @@ -25,7 +25,7 @@ USE_LIBTOOL_VER=13 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALLS_SHLIB= yes XERCESCROOT= `cd ${PORTSDIR}/textproc/xerces-c2; ${MAKE} -V WRKSRC` -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= XERCESCROOT=${XERCESCROOT} CONFIGURE_SCRIPT= runConfigure CONFIGURE_ARGS+= --disable-static diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile index c9590a2f6ffe..fd4a49b02db7 100644 --- a/textproc/linux-f10-libxml/Makefile +++ b/textproc/linux-f10-libxml/Makefile @@ -13,6 +13,6 @@ CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml -RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= libxml-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile index c9590a2f6ffe..fd4a49b02db7 100644 --- a/textproc/linux-f10-libxml2/Makefile +++ b/textproc/linux-f10-libxml2/Makefile @@ -13,6 +13,6 @@ CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml -RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= libxml-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile index c9590a2f6ffe..fd4a49b02db7 100644 --- a/textproc/linux-f8-libxml/Makefile +++ b/textproc/linux-f8-libxml/Makefile @@ -13,6 +13,6 @@ CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml -RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= libxml-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile index c9590a2f6ffe..fd4a49b02db7 100644 --- a/textproc/linux-f8-libxml2/Makefile +++ b/textproc/linux-f8-libxml2/Makefile @@ -13,6 +13,6 @@ CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml -RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= libxml-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile index c9590a2f6ffe..fd4a49b02db7 100644 --- a/textproc/linux-libxml/Makefile +++ b/textproc/linux-libxml/Makefile @@ -13,6 +13,6 @@ CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml -RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= libxml-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile index c9590a2f6ffe..fd4a49b02db7 100644 --- a/textproc/linux-libxml2/Makefile +++ b/textproc/linux-libxml2/Makefile @@ -13,6 +13,6 @@ CATEGORIES= textproc linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of libxml -RPM_SET= libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +RPM_SET= libxml-${PORTVERSION}-1.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile index 87785e234fec..bade1d3bfd99 100644 --- a/textproc/sgmlformat/Makefile +++ b/textproc/sgmlformat/Makefile @@ -20,7 +20,7 @@ COMMENT= Generates groff and HTML from linuxdoc and docbook SGML documents .include <bsd.port.pre.mk> -.if ${MACHINE_ARCH} != "i386" +.if ${ARCH} != "i386" WITH_OPENJADE= yes .endif diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index fa7aba631b02..f7aa9293374c 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -15,7 +15,7 @@ MAINTAINER= kevlo@FreeBSD.org COMMENT= C/C++ and Java sources to HTML converter GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} .if defined(NOPORTDOCS) MAKE_ENV+= NOPORTDOCS="${NOPORTDOCS}" .endif diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index 82635e05eac2..7c010d33e340 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -13,8 +13,8 @@ MASTER_SITES= ftp://ftp.jclark.com/pub/sp/ MAINTAINER= ports@FreeBSD.org COMMENT= An object-oriented toolkit for SGML parsing and entity management -.if ${MACHINE_ARCH} == sparc64 -BROKEN= does not compile on ${MACHINE_ARCH} +.if ${ARCH} == sparc64 +BROKEN= does not compile on ${ARCH} .endif USE_SUBMAKE= yes diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile index 4a2998e0829e..5d6526a92970 100644 --- a/textproc/webcpp/Makefile +++ b/textproc/webcpp/Makefile @@ -21,7 +21,7 @@ COMMENT= Convert your source code to syntax highlighted HTML USE_GCC= 3.2 .endif GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_REINPLACE= yes diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile index 66ba9bb93ed7..9c0119f15875 100644 --- a/textproc/wv/Makefile +++ b/textproc/wv/Makefile @@ -38,7 +38,7 @@ MLINKS= wvWare.1 wvConvert.1 CPPFLAGS= -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" USE_GNOME+= glib20 CONFIGURE_ARGS+= --with-glib .else diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile index b32cb57a13e8..95cd88f5adcd 100644 --- a/textproc/xlhtml/Makefile +++ b/textproc/xlhtml/Makefile @@ -20,7 +20,7 @@ COMMENT= Convert Excel and PowerPoint files to HTML and text USE_GMAKE= yes USE_AUTOMAKE_VER= 14 USE_AUTOCONF_VER= 213 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= ppthtml.1 xlhtml.1 diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile index aa336cfc1097..757b277fde4f 100644 --- a/textproc/xmlto/Makefile +++ b/textproc/xmlto/Makefile @@ -35,7 +35,7 @@ USE_BZIP2= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-bash=${BASH_CMD} --with-getopt=${GETOPT_CMD} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} BASH_CMD= ${LOCALBASE}/bin/bash GETOPT_CMD= ${LOCALBASE}/bin/getopt diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile index 2f425689ba8d..870172dcc114 100644 --- a/vietnamese/xvnkb/Makefile +++ b/vietnamese/xvnkb/Makefile @@ -19,7 +19,7 @@ USE_XLIB= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes .if defined(WITHOUT_XFT) diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 94ec94886d9f..4119e8bfb9e3 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -22,7 +22,7 @@ USE_GPG?= yes SIG_FILES= ${DISTNAME}${EXTRACT_SUFX}.asc USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-netrc ALL_TARGET= cadaver diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index 7a0a8e5c71a0..eba9fdefc696 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -17,7 +17,7 @@ COMMENT= A C++ class library for writing CGI applications USE_REINPLACE= yes USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS} INSTALLS_SHLIB= yes diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile index a505a96935b4..27916a2a09ca 100644 --- a/www/dpsearch/Makefile +++ b/www/dpsearch/Makefile @@ -21,7 +21,7 @@ INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=13 DOCSDIR= ${PREFIX}/share/doc/dataparksearch -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/dpsearch \ --localstatedir=/var/dpsearch \ --enable-mp3 \ diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile index 6888b12c9dbe..9512bfcb62d5 100644 --- a/www/ffproxy/Makefile +++ b/www/ffproxy/Makefile @@ -14,7 +14,7 @@ MAINTAINER= krion@FreeBSD.org COMMENT= Filtering HTTP proxy server GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/www/httrack/Makefile b/www/httrack/Makefile index 40d5a1d03b18..7a80f4f067cf 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes MAN1= htsserver.1 httrack.1 webhttrack.1 diff --git a/www/hydra/Makefile b/www/hydra/Makefile index ea5b6befdfc1..5fc64e237d9d 100644 --- a/www/hydra/Makefile +++ b/www/hydra/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= gnutls.12:${PORTSDIR}/security/gnutls NO_LATEST_LINK= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS= -I${LOCALBASE}/include diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index b86cb4484168..25ebbb3a1ee9 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -23,7 +23,7 @@ USE_REINPLACE= yes USE_RC_SUBR= yes USE_LIBTOOL_VER= 15 USE_GNOME= lthack -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd STARTUP_FILE= ${PREFIX}/etc/rc.d/lighttpd.sh diff --git a/www/linux-lesstif-ns/Makefile b/www/linux-lesstif-ns/Makefile index f8ee74e43096..003c93fed26d 100644 --- a/www/linux-lesstif-ns/Makefile +++ b/www/linux-lesstif-ns/Makefile @@ -32,7 +32,7 @@ USE_BZIP2= yes USE_LINUX_PREFIX= yes PREFIX= ${LINUXBASE}${X11BASE} HAS_CONFIGURE= yes -CONFIGURE_ARGS= --host=${MACHINE_ARCH}--linux-gnu \ +CONFIGURE_ARGS= --host=${ARCH}--linux-gnu \ --enable-shared --enable-production \ --enable-build-12 --enable-default-12 --disable-build-20 \ --disable-debug --no-recursion \ diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index bc284459ec3f..3ef3e5543553 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}2-8-6 USE_BZIP2= yes NO_LATEST_LINK= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \ --enable-nsl-fork --enable-nls --with-bzlib \ --enable-nested-tables --enable-locale-charset \ diff --git a/www/man2web/Makefile b/www/man2web/Makefile index 120dabc0cd70..38fd160303bc 100644 --- a/www/man2web/Makefile +++ b/www/man2web/Makefile @@ -16,7 +16,7 @@ MAINTAINER= naddy@FreeBSD.org COMMENT= Convert man pages to HTML GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --bindir="${PREFIX}/${CGIDIR}" \ --sysconfdir="${PREFIX}/etc" \ --with-manpath=/usr/share/man:${X11BASE}/man:${LOCALBASE}/man \ diff --git a/www/middleman/Makefile b/www/middleman/Makefile index a29e78418973..4bcbbe4dc40a 100644 --- a/www/middleman/Makefile +++ b/www/middleman/Makefile @@ -17,7 +17,7 @@ COMMENT= A robust proxy server WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_REINPLACE= yes diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index 88016f293055..2a55ec6a8d41 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=13 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--enable-phrase \ --enable-shared \ --sysconfdir=${PREFIX}/etc/mnogosearch \ diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile index 88016f293055..2a55ec6a8d41 100644 --- a/www/mnogosearch31/Makefile +++ b/www/mnogosearch31/Makefile @@ -23,7 +23,7 @@ INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=13 GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--enable-phrase \ --enable-shared \ --sysconfdir=${PREFIX}/etc/mnogosearch \ diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile index 813d1fb7828b..38f0c3aaf7d0 100644 --- a/www/mplayer-plugin/Makefile +++ b/www/mplayer-plugin/Makefile @@ -32,7 +32,7 @@ USE_REINPLACE= yes USE_GMAKE= yes PLUGINSFILES= mplayerplug-in.so mplayerplug-in.xpt GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -DBSD" \ LDFLAGS="-L${X11BASE}/lib" diff --git a/www/netrik/Makefile b/www/netrik/Makefile index 288eb0a71a28..ae8c27de1536 100644 --- a/www/netrik/Makefile +++ b/www/netrik/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_GMAKE= yes USE_GETOPT_LONG=yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} .if defined(NOPORTDOCS) USE_REINPLACE= yes .endif diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index c0918a071d10..09edccfa01c6 100644 --- a/www/tidy-devel/Makefile +++ b/www/tidy-devel/Makefile @@ -28,7 +28,7 @@ PLIST_SUB= SHLIB="@comment " USE_AUTOMAKE_VER= 15 AUTOMAKE_ARGS+= -a -c --foreign USE_AUTOCONF_VER= 213 -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes PLIST_SUB= SHLIB="" diff --git a/www/wml/Makefile b/www/wml/Makefile index 5f47736beccf..73be54216420 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl=${PERL5} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ PERL_ARCH="${PERL_ARCH}" -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 LIBTOOLFILES= wml_backend/p2_mp4h/configure PLIST_SUB+= ARCH=${PERL_ARCH} diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile index 585bd89e5c00..9459288530ae 100644 --- a/x11-clocks/wmclockmon/Makefile +++ b/x11-clocks/wmclockmon/Makefile @@ -18,7 +18,7 @@ USE_XPM= yes USE_GNOME= gtk12 USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= wmclockmon.1 wmclockmon-config.1 wmclockmon-cal.1 diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile index 201bbfd6305b..e7069dd72eb7 100644 --- a/x11-clocks/xdaliclock/Makefile +++ b/x11-clocks/xdaliclock/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/X11 USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= xdaliclock.1 PLIST_FILES= bin/xdaliclock diff --git a/x11-fm/FSViewer/Makefile b/x11-fm/FSViewer/Makefile index 2256a9df73cf..8f92fb256062 100644 --- a/x11-fm/FSViewer/Makefile +++ b/x11-fm/FSViewer/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS= `pkg-config --cflags WINGs` diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile index e9a257d9002b..145e3486b049 100644 --- a/x11-fm/krusader/Makefile +++ b/x11-fm/krusader/Makefile @@ -23,7 +23,7 @@ QTDIR?=${X11BASE}/bin KDEDIR?=${LOCALBASE}/bin CONFIGURE_TARGET= CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR} -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes MAN1= krusader.1 diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index e9a257d9002b..145e3486b049 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -23,7 +23,7 @@ QTDIR?=${X11BASE}/bin KDEDIR?=${LOCALBASE}/bin CONFIGURE_TARGET= CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR} -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} INSTALLS_SHLIB= yes MAN1= krusader.1 diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile index fe6e7bb83d90..937dcc465140 100644 --- a/x11-fm/tkdesk/Makefile +++ b/x11-fm/tkdesk/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= itcl32:${PORTSDIR}/lang/itcl \ USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAG="-I${LOCALBASE}/include/itcl3.2" \ LDFLAGS="-L${LOCALBASE}/lib -litcl32" CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.3 \ diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index f539d17cf1d9..0bc178f03c9f 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -22,7 +22,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CONFIGURE_ARGS= --enable-freetype INSTALLS_SHLIB= yes diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile index a392799b8aa8..2751f4e4ae1d 100644 --- a/x11-servers/Xfstt/Makefile +++ b/x11-servers/Xfstt/Makefile @@ -16,7 +16,7 @@ COMMENT= A TrueType font server for X11 USE_X_PREFIX= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var --disable-nls MAN1= xfstt.1x diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile index 6e5d5fd7ae71..d1c55ed2f2b5 100644 --- a/x11-themes/linux-gtk-bluecurve-theme/Makefile +++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile @@ -8,8 +8,8 @@ PORTNAME= linux-gtk-bluecurve-theme PORTVERSION= 0.73 CATEGORIES= x11-themes -MASTER_SITES= ftp://fr.rpmfind.net/linux/redhat/9/en/os/${MACHINE_ARCH}/RedHat/RPMS/ -DISTFILES= redhat-artwork-${PORTVERSION}-1.${MACHINE_ARCH}.rpm +MASTER_SITES= ftp://fr.rpmfind.net/linux/redhat/9/en/os/${ARCH}/RedHat/RPMS/ +DISTFILES= redhat-artwork-${PORTVERSION}-1.${ARCH}.rpm DIST_SUBDIR= rpm MAINTAINER= jylefort@brutele.be diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile index bac6290453f9..7205dcaded3f 100644 --- a/x11-toolkits/Xaw3d/Makefile +++ b/x11-toolkits/Xaw3d/Makefile @@ -33,7 +33,7 @@ post-extract: ${SED} 's|%%XAWVER%%|${XAWVER}|g' ${MSG_FILE} > ${PKGMESSAGE} # Workaround a bug in egcs on FreeBSD/Alpha. -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" post-configure: @(cd ${WRKSRC}; ${MV} Makefile Makefile.orig; ${SED} -e \ 's/CDEBUGFLAGS = -O/CDEBUGFLAGS =/g' Makefile.orig > Makefile) diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index 9c0dd83fd62c..ff621003b182 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -36,7 +36,7 @@ VERSION= 1.1.6 USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+=--enable-shared --enable-xft # configure ignores ${CXX} and keeps on linking C++ code with ${CC} CONFIGURE_ENV+= CC="${CXX}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile index 624a00f01e6c..e3496ba27d3d 100644 --- a/x11-toolkits/flvw/Makefile +++ b/x11-toolkits/flvw/Makefile @@ -35,7 +35,7 @@ INC_FILES= Flv_CStyle.H Flv_Data_Source.H Flv_List.H Flv_Style.H \ INSTALLS_SHLIB= yes -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile index bba06ef89e41..30cf13b7f1dd 100644 --- a/x11-toolkits/fox-devel/Makefile +++ b/x11-toolkits/fox-devel/Makefile @@ -31,7 +31,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER} USE_GL= yes USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe INSTALLS_SHLIB= yes diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index bba06ef89e41..30cf13b7f1dd 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -31,7 +31,7 @@ PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER} USE_GL= yes USE_REINPLACE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-opengl --with-x --enable-threadsafe INSTALLS_SHLIB= yes diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index 619d6f76e885..fa7bba4825de 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -31,7 +31,7 @@ PLIST_FILES= include/gai/gai.h lib/libgai.so.0.5.4 lib/libgai.so.0 \ PLIST_DIRS= include/gai INSTALLS_SHLIB= yes -.if ${MACHINE_ARCH:L} == "amd64" +.if ${ARCH:L} == "amd64" CFLAGS+= -fPIC .endif diff --git a/x11-toolkits/gauche-gtk/Makefile b/x11-toolkits/gauche-gtk/Makefile index b3092c4d8240..c76f0d392f88 100644 --- a/x11-toolkits/gauche-gtk/Makefile +++ b/x11-toolkits/gauche-gtk/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}/gtk DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/gtk PLIST_SUB= VERSION="`gauche-config -V`" \ - TARGET="${MACHINE_ARCH}-portbld-freebsd${OSREL}" + TARGET="${ARCH}-portbld-freebsd${OSREL}" .if defined(WITH_GTKGLEXT) LIB_DEPENDS+= gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile index 7f2b76b30cdf..0e8c30835751 100644 --- a/x11-toolkits/gob/Makefile +++ b/x11-toolkits/gob/Makefile @@ -20,7 +20,7 @@ USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} MAN1= gob.1 diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 048ef7f001d5..70b57682769c 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -27,7 +27,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 27cb4e497874..0d87e915d703 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -23,7 +23,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 8fcdf76c9362..a9a4853a4946 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL INSTALLS_SHLIB= yes diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile index 8b2255fbc801..edc65e2ecad7 100644 --- a/x11-toolkits/libgtkeditor/Makefile +++ b/x11-toolkits/libgtkeditor/Makefile @@ -30,7 +30,7 @@ CFLAGS+= -fPIC CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} pre-configure: .for file in install-sh mkinstalldirs diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile index 40884e0cc17e..60d6b42d0426 100644 --- a/x11-toolkits/linux-f10-openmotif/Makefile +++ b/x11-toolkits/linux-f10-openmotif/Makefile @@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ MASTER_SITE_SUBDIR= om2.2.4/redhat-7.3 PKGNAMEPREFIX= linux- -EXTRACT_SUFX= -0.1.${MACHINE_ARCH}.rpm +EXTRACT_SUFX= -0.1.${ARCH}.rpm DIST_SUBDIR= rpm EXTRACT_ONLY= @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 USE_LINUX_PREFIX= yes NO_BUILD= yes NO_FILTER_SHLIBS= yes -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} EXTRACT_FILES= ./usr/X11R6/lib/libMrm.so.3.0.3 \ ./usr/X11R6/lib/libUil.so.3.0.3 \ diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile index 40884e0cc17e..60d6b42d0426 100644 --- a/x11-toolkits/linux-f8-openmotif/Makefile +++ b/x11-toolkits/linux-f8-openmotif/Makefile @@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ MASTER_SITE_SUBDIR= om2.2.4/redhat-7.3 PKGNAMEPREFIX= linux- -EXTRACT_SUFX= -0.1.${MACHINE_ARCH}.rpm +EXTRACT_SUFX= -0.1.${ARCH}.rpm DIST_SUBDIR= rpm EXTRACT_ONLY= @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 USE_LINUX_PREFIX= yes NO_BUILD= yes NO_FILTER_SHLIBS= yes -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} EXTRACT_FILES= ./usr/X11R6/lib/libMrm.so.3.0.3 \ ./usr/X11R6/lib/libUil.so.3.0.3 \ diff --git a/x11-toolkits/linux-openmotif/Makefile b/x11-toolkits/linux-openmotif/Makefile index 40884e0cc17e..60d6b42d0426 100644 --- a/x11-toolkits/linux-openmotif/Makefile +++ b/x11-toolkits/linux-openmotif/Makefile @@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits linux MASTER_SITES= ftp://ftp.ics.com/pub/Products/Motif/%SUBDIR%/ MASTER_SITE_SUBDIR= om2.2.4/redhat-7.3 PKGNAMEPREFIX= linux- -EXTRACT_SUFX= -0.1.${MACHINE_ARCH}.rpm +EXTRACT_SUFX= -0.1.${ARCH}.rpm DIST_SUBDIR= rpm EXTRACT_ONLY= @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 USE_LINUX_PREFIX= yes NO_BUILD= yes NO_FILTER_SHLIBS= yes -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} EXTRACT_FILES= ./usr/X11R6/lib/libMrm.so.3.0.3 \ ./usr/X11R6/lib/libUil.so.3.0.3 \ diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile index 08c077c41bde..db1181ddcdb0 100644 --- a/x11-toolkits/neXtaw/Makefile +++ b/x11-toolkits/neXtaw/Makefile @@ -16,7 +16,7 @@ COMMENT= Athena Widgets with N*XTSTEP appearance USE_X_PREFIX= yes USE_REINPLACE= yes USE_INC_LIBTOOL_VER=13 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib" INSTALLS_SHLIB= yes diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index b5bbd76c7171..467d65054ee9 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -29,7 +29,7 @@ USE_GNOME= gnomelibs gdkpixbuf libglade USE_PYTHON= yes USE_LIBTOOL_VER=15 CONFIGURE_ENV= PYTHON=${PYTHON_CMD} -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --target=${ARCH}-unknown-freebsd${OSREL} EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gtk diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile index 7e4735f2663f..61cec4dc66a9 100644 --- a/x11-toolkits/scx/Makefile +++ b/x11-toolkits/scx/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/scsh/scsh-install-pkg:${PORTSDIR}/devel/scsh-insta NO_BUILD= yes USE_XLIB= yes -PLIST_SUB= TARGET=${MACHINE_ARCH}-portbld-freebsd${OSREL} +PLIST_SUB= TARGET=${ARCH}-portbld-freebsd${OSREL} do-install: (cd ${WRKSRC}; ${LOCALBASE}/lib/scsh/scsh-install-pkg --prefix=${PREFIX}/lib/scsh) diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index 39b666f95a6d..164127cdf131 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Coin.43:${PORTSDIR}/graphics/Coin USE_QT_VER= 3 USE_GMAKE= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_ARGS= --with-pthread=yes --with-coin=${X11BASE} INSTALLS_SHLIB= yes diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile index 2342fb4e074f..e37a507b9f71 100644 --- a/x11-toolkits/v/Makefile +++ b/x11-toolkits/v/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://programming.ccp14.ac.uk/ftp-mirror/programming/objectcentra MAINTAINER= ports@FreeBSD.org COMMENT= A C++ GUI development framework for X11 and Microsoft Windows -.if ${MACHINE_ARCH} == "alpha" +.if ${ARCH} == "alpha" BROKEN= compiler error in function fixup_memory_subreg .endif diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile index 9b0fc3d7bfa3..872dcbb1dc63 100644 --- a/x11-toolkits/wxgtk/Makefile +++ b/x11-toolkits/wxgtk/Makefile @@ -73,7 +73,7 @@ LIB_DEPENDS+= wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode .if ${WXGTK_FLAVOR:Mgtk2*} != "" USE_GNOME= gtk20 -CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--enable-gtk2 ${ARCH}-portbld-freebsd${OSREL} .else USE_GNOME= gtk12 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET} diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 9b0fc3d7bfa3..872dcbb1dc63 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -73,7 +73,7 @@ LIB_DEPENDS+= wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode .if ${WXGTK_FLAVOR:Mgtk2*} != "" USE_GNOME= gtk20 -CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS+=--enable-gtk2 ${ARCH}-portbld-freebsd${OSREL} .else USE_GNOME= gtk12 CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET} diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile index b012e04caae0..2ba788b40b4d 100644 --- a/x11-toolkits/xbae/Makefile +++ b/x11-toolkits/xbae/Makefile @@ -19,7 +19,7 @@ COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_MOTIF= yes USE_X_PREFIX= yes diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile index be7563f59752..f159468d5b86 100644 --- a/x11-wm/bbconf/Makefile +++ b/x11-wm/bbconf/Makefile @@ -18,7 +18,7 @@ USE_X_PREFIX= yes USE_QT_VER= 3 USE_PERL5_BUILD= yes USE_LIBTOOL_VER= 15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= bbconf.1 PORTDOCS= AUTHORS ChangeLog README README.html TODO diff --git a/x11-wm/fbpager/Makefile b/x11-wm/fbpager/Makefile index 27da828b22da..a8086be0f285 100644 --- a/x11-wm/fbpager/Makefile +++ b/x11-wm/fbpager/Makefile @@ -15,7 +15,7 @@ COMMENT= Desktop pager for the Fluxbox window manager USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/fbpager PORTDOCS= AUTHORS ChangeLog NEWS README TODO diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile index bff430ba92bc..87bfe5c327af 100644 --- a/x11-wm/peksystray/Makefile +++ b/x11-wm/peksystray/Makefile @@ -16,7 +16,7 @@ COMMENT= A system tray dockapp similar to the GNOME notification area applet USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} PLIST_FILES= bin/peksystray diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 0abb792da434..82a1fda077ef 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-shape --enable-xinerama --enable-xrandr \ --disable-pcre --enable-xft --enable-imlib2 --disable-debug \ --enable-menus --enable-harbour diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile index 4193710ab80e..b33c473ba8b4 100644 --- a/x11-wm/ude/Makefile +++ b/x11-wm/ude/Makefile @@ -20,7 +20,7 @@ USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-wm/wmconfig/Makefile b/x11-wm/wmconfig/Makefile index 7957594a414d..77d91f324da7 100644 --- a/x11-wm/wmconfig/Makefile +++ b/x11-wm/wmconfig/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ USE_BZIP2= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= wmconfig.1x diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index 213d38ed378a..10c15ae7511c 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -23,7 +23,7 @@ USE_XPM= yes USE_GNOME= gdkpixbuf USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \ diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile index 1eedc75b7578..4af8efec8da9 100644 --- a/x11/3ddesktop/Makefile +++ b/x11/3ddesktop/Makefile @@ -23,7 +23,7 @@ USE_GL= yes USE_GETOPT_LONG= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PORTDOCS= README README.windowmanagers diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 5af3dc5b1890..8420bd03bddc 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= OSMESA:="" .endif # sparc64 doesn't have a working libc_r yet, and -current doesn't need libXThrStub. -.if ${MACHINE_ARCH} == "sparc64" || ${OSVERSION} >= 500043 +.if ${ARCH} == "sparc64" || ${OSVERSION} >= 500043 PLIST_SUB+= XTHRSTUB:="@comment " .else PLIST_SUB+= XTHRSTUB:="" diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index 6aff6a52f82f..2f50616efd0d 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -33,7 +33,7 @@ INSTALL_TARGET+= install.linkkit .endif DIST_SUBDIR= xc SCRIPTS_ENV= OSVERSION=${OSVERSION} MACHINE=${MACHINE} \ - MACHINE_ARCH=${MACHINE_ARCH} + ARCH=${ARCH} MAKE_ARGS= WORLDOPTS= # can't use USE_X_PREFIX here -- it will cause a circular dependency PREFIX= ${X11BASE} diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile index 326b32b1af80..5e8563e51098 100644 --- a/x11/compositeext/Makefile +++ b/x11/compositeext/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LIB_PC_DEPENDS} USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes USE_GNOME= gnomehack pkgconfig diff --git a/x11/damageext/Makefile b/x11/damageext/Makefile index 702b4cc237e6..a61ffc029639 100644 --- a/x11/damageext/Makefile +++ b/x11/damageext/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LIB_PC_DEPENDS} USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes USE_GNOME= gnomehack pkgconfig diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index bed51efc8ba6..15f7ea4f5bbc 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LIB_PC_DEPENDS} USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes USE_GNOME= gnomehack pkgconfig diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index bb24110f77c1..d551133642df 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -59,7 +59,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --enable-mt \ - --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ + --build=${ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include CONFIGURE_ENV+= libltdl_cv_shlibext=".so" diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index bb24110f77c1..d551133642df 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -59,7 +59,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET=# empty CONFIGURE_ARGS+=--disable-ltdl-install \ --enable-mt \ - --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ + --build=${ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include CONFIGURE_ENV+= libltdl_cv_shlibext=".so" diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 50fbc75f42a4..7073a1a25e88 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -23,7 +23,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index e1bf1841430a..cfb14e2c30df 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -26,7 +26,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CONFIGURE_ARGS+= --enable-xdmauth CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index 7960cd3bfcfa..8dcfca267fc2 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -21,7 +21,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 USE_GNOME= gnomehack pkgconfig diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index 3ee1261ccdef..63531e0c4c5f 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LIB_PC_DEPENDS} USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index 2409ff398345..66de74cb48bf 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -27,7 +27,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile index 1aa2c98d9fce..3e0ada2afd7f 100644 --- a/x11/libXdamage/Makefile +++ b/x11/libXdamage/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LIB_PC_DEPENDS} USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile index 613cac4b4866..de2a863403ad 100644 --- a/x11/libXdmcp/Makefile +++ b/x11/libXdmcp/Makefile @@ -27,7 +27,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes INSTALLS_SHLIB= yes USE_GNOME= gnomehack pkgconfig diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index ca4a84836707..3c7644df680f 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -23,7 +23,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index 834e5f96ef2b..7aacbc49d16f 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LIB_PC_DEPENDS} USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXfont/Makefile b/x11/libXfont/Makefile index f539d17cf1d9..0bc178f03c9f 100644 --- a/x11/libXfont/Makefile +++ b/x11/libXfont/Makefile @@ -22,7 +22,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CONFIGURE_ARGS= --enable-freetype INSTALLS_SHLIB= yes diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index 643c11ec21ab..b5945eb4538e 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -25,7 +25,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index b3a1d500e2f7..47106d6cec89 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -23,7 +23,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CFLAGS+= -DMALLOC_0_RETURNS_NULL INSTALLS_SHLIB= yes diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index 258d25dcd4a4..6ff9206ba590 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_INC_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL INSTALLS_SHLIB= yes diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 0b50160596e0..6e810f3bd4aa 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -27,7 +27,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes CFLAGS+= -DMALLOC_0_RETURNS_NULL INSTALLS_SHLIB= yes diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index 3e7e282ad082..8b7aec47c8d8 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -26,7 +26,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_INC_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index 469d86022389..5e2364cfc931 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -28,7 +28,7 @@ USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL INSTALLS_SHLIB= yes diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile index aaf12abdf215..6d264b26783f 100644 --- a/x11/libXtrans/Makefile +++ b/x11/libXtrans/Makefile @@ -17,7 +17,7 @@ COMMENT= Network API translation layer for X applications and libraries USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_GNOME= gnomehack diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 8faacf984e29..ce87a4552b44 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -22,7 +22,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_LIBTOOL_VER=13 CFLAGS+= -DMALLOC_0_RETURNS_NULL diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile index 2abe16032092..55a2f1bd3bcb 100644 --- a/x11/linux-gnomelibs/Makefile +++ b/x11/linux-gnomelibs/Makefile @@ -13,12 +13,12 @@ CATEGORIES= x11 linux MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of gnome-libs -RPM_SET= gnome-libs-${PORTVERSION}-11.${MACHINE_ARCH}.rpm +RPM_SET= gnome-libs-${PORTVERSION}-11.${ARCH}.rpm .include "../../x11-toolkits/linux-gtk/Makefile" -.if (${MACHINE_ARCH} == "i386") +.if (${ARCH} == "i386") MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/RedHat/RPMS/ -.elif (${MACHINE_ARCH} == "alpha") +.elif (${ARCH} == "alpha") MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/alpha/RedHat/RPMS/ .endif diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile index cac30db984d9..b81997b65f6e 100644 --- a/x11/multi-aterm/Makefile +++ b/x11/multi-aterm/Makefile @@ -16,7 +16,7 @@ COMMENT= A multi terminal based on aterm USE_X_PREFIX= yes USE_LIBTOOL_VER=13 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} DOCS= AUTHORS ChangeLog INSTALL TODO MAN1= multi-aterm.1 diff --git a/x11/panoramixext/Makefile b/x11/panoramixext/Makefile index 70067598b5ac..85e98a41ffa7 100644 --- a/x11/panoramixext/Makefile +++ b/x11/panoramixext/Makefile @@ -18,7 +18,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_GNOME= gnomehack diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile index 73b4dcd1e0ff..7553e54d8aad 100644 --- a/x11/randrext/Makefile +++ b/x11/randrext/Makefile @@ -18,7 +18,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes diff --git a/x11/renderext/Makefile b/x11/renderext/Makefile index 4ef86b0c7e80..4c4b3edc7d06 100644 --- a/x11/renderext/Makefile +++ b/x11/renderext/Makefile @@ -19,7 +19,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig diff --git a/x11/resourceext/Makefile b/x11/resourceext/Makefile index c82986ec7468..26599917c8e3 100644 --- a/x11/resourceext/Makefile +++ b/x11/resourceext/Makefile @@ -19,7 +19,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes USE_GNOME= gnomehack diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 000c88acbf7f..4aacb8f9b940 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -22,7 +22,7 @@ USE_X_PREFIX= yes USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-everything --with-term=rxvt -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 64f53904a150..31a5e28f5fbf 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -27,7 +27,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ DEF_SERVER="${DEF_SERVER}" CONFIGURE_ARGS= --with-logdir=/var/log \ diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile index 803be8ad8e52..88395cfa8442 100644 --- a/x11/xautomation/Makefile +++ b/x11/xautomation/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/x11/xextensions/Makefile b/x11/xextensions/Makefile index 10de5b88c80b..b5a3188f8569 100644 --- a/x11/xextensions/Makefile +++ b/x11/xextensions/Makefile @@ -21,7 +21,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes USE_GNOME= gnomehack diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 382a75dad810..82baf1695b62 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -34,7 +34,7 @@ USE_X_PREFIX= yes USE_XPM= yes MAN1= xlock.1 -.if ${MACHINE_ARCH} == "amd64" +.if ${ARCH} == "amd64" WITH_MESAGL= no .else WITH_MESAGL?= yes diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile index b1293721f15e..cc752b231aea 100644 --- a/x11/xnee/Makefile +++ b/x11/xnee/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= xnee.1 INFO= xnee xnee_develop diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index 9616df522aed..f284f9cdafe5 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -18,7 +18,7 @@ CONFLICTS= XFree86-libraries-* xorg-libraries-* USE_BZIP2= yes PREFIX?= ${X11BASE} GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes NO_BUILD= yes USE_GNOME= gnomehack diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 9156c91d6661..f8a45f1b71c9 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" CONFIGURE_ARGS+= --enable-wide-chars --enable-luit --with-utempter diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile index f8ea7711a7e8..e9072284cefe 100644 --- a/x11/xtermcontrol/Makefile +++ b/x11/xtermcontrol/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= xterm-static:${PORTSDIR}/x11/xterm USE_X_PREFIX= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index ce8f27876864..d40396c0b746 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -20,7 +20,7 @@ USE_PERL5_BUILD= yes USE_GETOPT_LONG= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} MAN1= xvattr.1 |