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 /graphics | |
| 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
Diffstat (limited to 'graphics')
64 files changed, 112 insertions, 91 deletions
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" \ |