diff options
Diffstat (limited to 'graphics')
303 files changed, 674 insertions, 806 deletions
diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile index 3b32dcfbfe4a..926ef32ea63b 100644 --- a/graphics/4va/Makefile +++ b/graphics/4va/Makefile @@ -7,7 +7,7 @@ PORTNAME= 4va PORTVERSION= 1.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/hacks/X @@ -16,9 +16,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Four-Dimensional graphics tumbler for X11 -USE_XLIB= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \ - CLIBS="-lm -lX11 -L${X11BASE}/lib" +USE_XORG= x11 + +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + CLIBS="-lm -lX11 -L${LOCALBASE}/lib" MAN1= 4va.1 diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile index 6e77320a3f0c..31d397b276ee 100644 --- a/graphics/Cgraph/Makefile +++ b/graphics/Cgraph/Makefile @@ -17,7 +17,7 @@ COMMENT= A PostScript plotting library in C WRKSRC= ${WRKDIR}/Cgraph/source -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-extract: @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile index dbd8af47103e..4ac7b1c355d4 100644 --- a/graphics/EZWGL/Makefile +++ b/graphics/EZWGL/Makefile @@ -7,7 +7,7 @@ PORTNAME= EZWGL PORTVERSION= 1.50 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics devel MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/ DISTFILES= ${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz @@ -18,7 +18,7 @@ COMMENT= The EZ Widget and Graphics Library LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png -USE_X_PREFIX= yes +USE_XORG= x11 xext USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 7e8c4b01e3ae..c0ffda144e91 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -41,7 +41,7 @@ MAN5= quantize.5 .ifndef WINDOWS_FONT_DIR # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${X11BASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts .endif CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index 7e8c4b01e3ae..c0ffda144e91 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/Makefile @@ -41,7 +41,7 @@ MAN5= quantize.5 .ifndef WINDOWS_FONT_DIR # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${X11BASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts .endif CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index 7e8c4b01e3ae..c0ffda144e91 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -41,7 +41,7 @@ MAN5= quantize.5 .ifndef WINDOWS_FONT_DIR # Use fonts installed by x11-fonts/webfonts by default -WINDOWS_FONT_DIR=${X11BASE}/lib/X11/fonts/webfonts +WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts .endif CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 1d59563d5d99..7f9246044354 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -251,9 +251,9 @@ CONFIGURE_ARGS+= --without-freetype .if !defined(WITHOUT_IMAGEMAGICK_FONTCONFIG) LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --with-fontconfig -CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${X11BASE}/include" \ - FONTCONFIG_LIBS="-L${X11BASE}/lib" -MAKE_ENV+= FONTCONFIG_CFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \ + FONTCONFIG_LIBS="-L${LOCALBASE}/lib" +MAKE_ENV+= FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" .else CONFIGURE_ARGS+= --without-fontconfig .endif @@ -284,8 +284,8 @@ IGNORE= SVG support requires X11 libraries, please unset WITHOUT_X11 .endif LIB_DEPENDS+= rsvg-2:${PORTSDIR}/graphics/librsvg2 CONFIGURE_ARGS+= --with-rsvg -CONFIGURE_ENV+= RSVG_CFLAGS="-I${X11BASE}/include/librsvg-2" \ - RSVG_LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV+= RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2" \ + RSVG_LIBS="-L${LOCALBASE}/lib" .else CONFIGURE_ARGS+= --without-rsvg .endif diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile index 02c5a797a1de..fd8dec8588bc 100644 --- a/graphics/SciPlot/Makefile +++ b/graphics/SciPlot/Makefile @@ -18,7 +18,7 @@ COMMENT= A full-featured Xt widget to display 2D data in a graph USE_MOTIF= yes USE_IMAKE= yes MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INCLUDES= SciPlot.h SciPlotP.h SciPlotUtil.h LIBNAME= lib${PORTNAME:L} # Remove :L for libSciPlot diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 5ba658fde701..e8a391010712 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -9,8 +9,7 @@ PORTNAME= aalib PORTVERSION= 1.4.r5 PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= aa-project +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= shaun@FreeBSD.org @@ -19,13 +18,13 @@ COMMENT= An ascii art library USE_AUTOTOOLS= libtool:15 WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INFO= aalib .if !defined(WITHOUT_X11) USE_XORG= x11 -CONFIGURE_ARGS= --x-includes="${X11BASE}/include" \ - --x-libraries="${X11BASE}/lib" +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \ + --x-libraries="${LOCALBASE}/lib" .else CONFIGURE_ARGS= --with-x=no .endif diff --git a/graphics/allegrogl/Makefile b/graphics/allegrogl/Makefile index e3c0a1d4e98f..d476ec343870 100644 --- a/graphics/allegrogl/Makefile +++ b/graphics/allegrogl/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro USE_BZIP2= yes USE_GMAKE= yes -USE_GL= yes +USE_GL= glu USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKEFILE= makefile @@ -44,7 +44,7 @@ post-install: s|%%RM%%|${RM}|g; \ s|%%CFLAGS%%|${CFLAGS}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ + s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \ < ${FILESDIR}/makefile.ex > ${EXAMPLESDIR}/makefile diff --git a/graphics/allegrogl/files/makefile.ex b/graphics/allegrogl/files/makefile.ex index 0c32c4be6287..9880ad6e7962 100644 --- a/graphics/allegrogl/files/makefile.ex +++ b/graphics/allegrogl/files/makefile.ex @@ -1,7 +1,7 @@ CC= %%CC%% RM= %%RM%% -CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include -LDFLAGS= -L%%X11BASE%%/lib -L%%PREFIX%%/lib -lagl -lGL -lGLU +CFLAGS= %%CFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include +LDFLAGS= -L%%LOCALBASE%%/lib -L%%PREFIX%%/lib -lagl -lGL -lGLU ALLEGRO_CFLAGS!=allegro-config --cflags ALLEGRO_LFLAGS!=allegro-config --libs diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile index 395521d925d1..70b403bf90d2 100644 --- a/graphics/animorph/Makefile +++ b/graphics/animorph/Makefile @@ -19,8 +19,8 @@ USE_GMAKE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 17da74a38722..df1b37f98c5c 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -7,7 +7,7 @@ PORTNAME= autotrace PORTVERSION= 0.31.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF @@ -21,7 +21,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ming" -USE_XLIB= yes MAN1= autotrace.1 diff --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared index a50576eda47b..e16c0728630f 100644 --- a/graphics/ayam/files/patch-Makefile.shared +++ b/graphics/ayam/files/patch-Makefile.shared @@ -53,7 +53,7 @@ # OpenGL # OpenGL includes -GLINC = -I/usr/X11R6/include/ -+GLINC = -I${X11BASE}/include/ ++GLINC = -I${LOCALBASE}/include/ # MacOSX (Aqua): #GLINC = # link options for linking with OpenGL libraries @@ -62,7 +62,7 @@ # TIFF # TIFF includes -TIFFINC = -I/usr/include/ -+TIFFINC = -I${X11BASE}/include/ ++TIFFINC = -I${LOCALBASE}/include/ # link options for linking with TIFF library TIFFLIB = -ltiff @@ -113,12 +113,12 @@ # X11 # X11 includes -X11INC = -I/usr/X11R6/include -+X11INC = -I${X11BASE}/include ++X11INC = -I${LOCALBASE}/include # MacOSX (Aqua): #X11INC = # link options for linking with X11 -X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 -+X11LIBS = -L${X11BASE}/lib -lXmu -lXext -lX11 ++X11LIBS = -L${LOCALBASE}/lib -lXmu -lXext -lX11 #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 # MacOSX (Aqua): #X11LIBS = diff --git a/graphics/backfract/Makefile b/graphics/backfract/Makefile index 3324ff6ba222..1411c7c55e3a 100644 --- a/graphics/backfract/Makefile +++ b/graphics/backfract/Makefile @@ -7,17 +7,17 @@ PORTNAME= backfract PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.igoweb.org/~wms/comp/backfract/ MAINTAINER= ports@FreeBSD.org COMMENT= Fractal image animated wallpaper program +USE_XORG= x11 PLIST_FILES= bin/backfract GNU_CONFIGURE= yes USE_PERL5_BUILD=yes -USE_X_PREFIX= yes NO_INSTALL_MANPAGE= yes ALL_TARGET= # none diff --git a/graphics/bbrb/Makefile b/graphics/bbrb/Makefile index aaee140bb27b..3984c5c30732 100644 --- a/graphics/bbrb/Makefile +++ b/graphics/bbrb/Makefile @@ -7,10 +7,9 @@ PORTNAME= bbrb PORTVERSION= 0.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A graphical background manager for the Blackbox window manager @@ -18,7 +17,6 @@ COMMENT= A graphical background manager for the Blackbox window manager RUN_DEPENDS= xv:${PORTSDIR}/graphics/xv \ blackbox:${PORTSDIR}/x11-wm/blackbox -USE_X_PREFIX= yes USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 263bbfa88dfa..8099226bebaf 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ + alut.1:${PORTSDIR}/audio/freealut\ openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ avutil.1:${PORTSDIR}/multimedia/ffmpeg PLIST_FILES= bin/blender @@ -79,7 +79,7 @@ pre-configure: s|-pipe||; \ s|-O2|${CFLAGS}|; \ s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \ - s|/usr/X11R6|${X11BASE}|' \ + s|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/source/nan_compile.mk @${REINPLACE_CMD} -e \ diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index 22552ef08df4..03d1b9580141 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -19,16 +19,16 @@ OPTIONS+= THREADS "With threading support" off GNU_CONFIGURE= yes USE_GCC= 3.4 -USE_GL= yes +USE_GL= gl USE_PERL5= yes USE_AUTOTOOLS= libltdl:15 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS=--enable-ltdl-install=no -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - GL_LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" \ + GL_LIBS="-L${LOCALBASE}/lib" MAN1= gldb.1 MAN3= bugle.3 @@ -70,6 +70,6 @@ BROKEN= Fails to link .endif post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/gentokens/find_header.perl + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/gentokens/find_header.perl .include <bsd.port.post.mk> diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index ce50820af35e..5b17f3d662f3 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -31,7 +31,7 @@ USE_GNOME= gnometarget gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${PTHREAD_LIBS}" .if defined(WITHOUT_X11) diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 650bf36f8c40..7d9a973239b3 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -22,8 +22,8 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget ltverhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}" .if defined(NOPORTDOCS) diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile index 686963640475..d591f859856b 100644 --- a/graphics/cbview/Makefile +++ b/graphics/cbview/Makefile @@ -7,7 +7,7 @@ PORTNAME= cbview PORTVERSION= 0.06 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics perl5 MASTER_SITES= http://elvine.org/code/cbview/ @@ -21,7 +21,6 @@ RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \ NO_BUILD= yes USE_PERL5= yes -USE_X_PREFIX= yes PLIST_FILES= bin/${PORTNAME} PORTDOCS= COPYING Changes INSTALL README TODO diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile index 2c105c9811be..149c7ec2069c 100644 --- a/graphics/chbg/Makefile +++ b/graphics/chbg/Makefile @@ -7,16 +7,14 @@ PORTNAME= chbg PORTVERSION= 1.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Change Background Picture with time period -USE_X_PREFIX= yes USE_GNOME= gdkpixbuf USE_GMAKE= yes USE_GETTEXT= yes diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index f34dc3b9d490..b968259b248c 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -7,10 +7,9 @@ PORTNAME= cimg PORTVERSION= 1.2.8 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= graphics devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= CImg-${DISTVERSION} DIST_SUBDIR= ${PKGNAME} @@ -21,12 +20,11 @@ USE_ZIP= yes BUILD_WRKSRC= ${WRKSRC}/examples MAKE_ENV= CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS}" \ - X11PATH=${X11BASE} + X11PATH=${LOCALBASE} .if !defined(NOPORTDOCS) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen USE_GMAKE= yes -USE_GCC= 3.4+ REINPLACE_ARGS= -i "" LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard . if !defined(WITHOUT_LAPACK) @@ -38,7 +36,6 @@ LAPACK_DEF= -Dcimg_lapack USE_FORTRAN= yes . if !defined(WITHOUT_OPTIMIZATIONS) -USE_XLIB= yes LIB_DEPENDS+= png:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ tiff:${PORTSDIR}/graphics/tiff \ diff --git a/graphics/claraocr/Makefile b/graphics/claraocr/Makefile index d4a3a133d330..da19af439ad0 100644 --- a/graphics/claraocr/Makefile +++ b/graphics/claraocr/Makefile @@ -7,7 +7,7 @@ PORTNAME= claraocr PORTVERSION= 0.9.9 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= graphics accessibility MASTER_SITES= ${MASTER_SITE_NETBSD} DISTNAME= clara-${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= Optical character recognition (OCR) utility RUN_DEPENDS= pnmenlarge:${PORTSDIR}/graphics/netpbm -USE_XLIB= yes +USE_XORG= x11 USE_PERL5= yes MAKE_ENV= MKDIR="${MKDIR}" diff --git a/graphics/claraocr/files/patch-Makefile b/graphics/claraocr/files/patch-Makefile index 24e8a6abbfd5..9cb923df07c7 100644 --- a/graphics/claraocr/files/patch-Makefile +++ b/graphics/claraocr/files/patch-Makefile @@ -23,8 +23,8 @@ -INCLUDE = -I/usr/X11R6/include -LIBPATH = -L/usr/X11R6/lib -CC = gcc -+INCLUDE = -I${X11BASE}/include -+LIBPATH = -L${X11BASE}/lib ++INCLUDE = -I${LOCALBASE}/include ++LIBPATH = -L${LOCALBASE}/lib +CC ?= gcc # diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile index 1367e6cc2de1..765ea6ba94b7 100644 --- a/graphics/corona/Makefile +++ b/graphics/corona/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="${LIBS} -L${LOCALBASE}/lib" diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 6a1ee5bb73db..72ff669aba77 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -7,7 +7,7 @@ PORTNAME= cqcam PORTVERSION= 0.91 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.cs.duke.edu/~reynolds/cqcam/ @@ -18,7 +18,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg ONLY_FOR_ARCHS= i386 -USE_XLIB= yes +USE_XORG= x11 USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/crystalentitylayer-devel/Makefile b/graphics/crystalentitylayer-devel/Makefile index c90e70bcff26..12160488d38e 100644 --- a/graphics/crystalentitylayer-devel/Makefile +++ b/graphics/crystalentitylayer-devel/Makefile @@ -24,8 +24,8 @@ CONFLICTS= crystalentitylayer-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --with-cs-prefix=${LOCALBASE} MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/graphics/crystalentitylayer/Makefile b/graphics/crystalentitylayer/Makefile index 59b28f364340..1a711410c421 100644 --- a/graphics/crystalentitylayer/Makefile +++ b/graphics/crystalentitylayer/Makefile @@ -24,8 +24,8 @@ CONFLICTS= crystalentitylayer-devel-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_ARGS+= --with-cs-prefix=${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile index 446ccb55b467..57a45d6fd6c7 100644 --- a/graphics/crystalspace-devel/Makefile +++ b/graphics/crystalspace-devel/Makefile @@ -33,8 +33,8 @@ GNU_CONFIGURE= yes USE_GCC= 3.4+ USE_GL= yes WANT_PERL= yes -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAKE_ENV= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}" \ CPPFLAGS="${CPPFLAGS} "LDFLAGS="${LDFLAGS}" @@ -119,8 +119,8 @@ CONFIGURE_ARGS+= --without-3ds .endif .if !defined(WITHOUT_ODE) -BUILD_DEPENDS+= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode -CONFIGURE_ARGS+= --with-ode=${X11BASE} +BUILD_DEPENDS+= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode +CONFIGURE_ARGS+= --with-ode=${LOCALBASE} .else CONFIGURE_ARGS+= --without-ode .endif diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile index db1079a81f1d..39222b614e30 100644 --- a/graphics/crystalspace/Makefile +++ b/graphics/crystalspace/Makefile @@ -125,8 +125,8 @@ CONFIGURE_ARGS+= --without-3ds .endif .if !defined(WITHOUT_ODE) -BUILD_DEPENDS+= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode -CONFIGURE_ARGS+= --with-ode=${X11BASE} +BUILD_DEPENDS+= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode +CONFIGURE_ARGS+= --with-ode=${LOCALBASE} .else CONFIGURE_ARGS+= --without-ode .endif diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 30a51e86de83..485d41e757bb 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -44,7 +44,7 @@ GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. post-extract: @${INSTALL_DATA} ${FILESDIR}/Makefile.tmpl ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's;%%LOCALBASE%%;${LOCALBASE};g ; \ - s;%%X11BASE%%;${X11BASE};g' \ + s;%%LOCALBASE%%;${LOCALBASE};g' \ ${WRKSRC}/Makefile @${MV} ${WRKSRC}/gl_src.c ${WRKSRC}/gl_src.c.bogus diff --git a/graphics/dataplot/files/Makefile.tmpl b/graphics/dataplot/files/Makefile.tmpl index 9f5a979dd355..7080252bff7c 100644 --- a/graphics/dataplot/files/Makefile.tmpl +++ b/graphics/dataplot/files/Makefile.tmpl @@ -1,13 +1,13 @@ -CFLAGS += -I%%LOCALBASE%%/include -I%%X11BASE%%/include +CFLAGS += -I%%LOCALBASE%%/include DEST = ${PREFIX}/bin -EXTHDRS = %%X11BASE%%/include/X11/X.h \ - %%X11BASE%%/include/X11/Xfuncproto.h \ - %%X11BASE%%/include/X11/Xlib.h \ - %%X11BASE%%/include/X11/Xmd.h \ - %%X11BASE%%/include/X11/Xosdefs.h \ - %%X11BASE%%/include/X11/Xutil.h \ +EXTHDRS = %%LOCALBASE%%/include/X11/X.h \ + %%LOCALBASE%%/include/X11/Xfuncproto.h \ + %%LOCALBASE%%/include/X11/Xlib.h \ + %%LOCALBASE%%/include/X11/Xmd.h \ + %%LOCALBASE%%/include/X11/Xosdefs.h \ + %%LOCALBASE%%/include/X11/Xutil.h \ %%LOCALBASE%%/include/gd/gd.h \ %%LOCALBASE%%/include/gd/gd_io.h @@ -17,7 +17,7 @@ INSTALL = install LD = $(CC) -LDFLAGS = -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib %%GCCLIBDIR%% +LDFLAGS = -L%%LOCALBASE%%/lib %%GCCLIBDIR%% LIBS = -lgd -lpng -ljpeg -lX11 -lz %%FORTRANLIBS%% -lm diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile index 1f0d14b6dfa9..395936da86e3 100644 --- a/graphics/demeter/Makefile +++ b/graphics/demeter/Makefile @@ -7,10 +7,9 @@ PORTNAME= demeter PORTVERSION= 3.21 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF .ifdef (WITH_SAMPLE_DATA) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ DemeterSampleData-${SAMPLE_DATA_VER}-2${EXTRACT_SUFX} @@ -20,14 +19,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A C++ library to render 3D terrains using OpenGL USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl glu WANT_GNOME= yes WANT_SDL= yes USE_AUTOTOOLS= automake:15 autoconf:261 libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS=" -L${LOCALBASE}/lib" USE_LDCONFIG= yes SAMPLE_DATA_VER= 3.20 @@ -45,7 +43,7 @@ WITH_SDL= yes WITH_LIBXML2= yes .endif -.if exists(${X11BASE}/lib/libosg.so) +.if exists(${LOCALBASE}/lib/libosg.so) WITH_OSG= yes .endif @@ -62,8 +60,8 @@ USE_GNOME= libxml2 .endif .ifdef (WITH_OSG) -BUILD_DEPENDS+= ${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg -RUN_DEPENDS+= ${X11BASE}/lib/libosg.so:${PORTSDIR}/graphics/osg +BUILD_DEPENDS+= ${LOCALBASE}/lib/libosg.so:${PORTSDIR}/graphics/osg +RUN_DEPENDS+= ${LOCALBASE}/lib/libosg.so:${PORTSDIR}/graphics/osg .endif .ifdef (WITH_GDAL) diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index ccdde291e3f2..caa742e48186 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -8,7 +8,7 @@ PORTNAME= dia DISTVERSION= 0.96.1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -22,7 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/t LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack \ desktopfileutils diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index e8a7503f7596..8d024780d7cc 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -10,8 +10,7 @@ PORTNAME= diacanvas2 PORTVERSION= 0.14.4 PORTREVISION= 1 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= diacanvas +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A general drawing canvas from dia dialog editor @@ -22,7 +21,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_DISPLAY= yes post-patch: diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile index 2ee5597c5b19..012aec774a10 100644 --- a/graphics/divxcalc/Makefile +++ b/graphics/divxcalc/Makefile @@ -8,20 +8,22 @@ PORTNAME= divxcalc PORTVERSION= 0.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://imagef1.net.nz/divxcalc/ MAINTAINER= ports@FreeBSD.org COMMENT= DivX Calculator +USE_XORG= x11 ice xext USE_BZIP2= yes USE_QT_VER= 3 USE_GMAKE= yes USE_AUTOTOOLS= automake:15:env autoconf:261:env GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= bin/divxcalc diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index 7788c850a33c..dd0a736425ea 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -9,8 +9,7 @@ PORTNAME= djview PORTVERSION= 4.3 PORTREVISION= 0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= djvu +MASTER_SITES= SF/djvu DISTNAME= ${PORTNAME}4-${PORTVERSION} MAINTAINER= stas@FreeBSD.org @@ -24,9 +23,9 @@ USE_QT_VER= 4 QT_COMPONENTS= gui network rcc uic moc qmake CONFIGURE_ENV= QMAKE="${LOCALBASE}/bin/qmake-qt4" \ QMAKESPEC="${QMAKESPEC}" \ - CFLAGS="-I${X11BASE}/include" \ - CXXFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" + CFLAGS="-I${LOCALBASE}/include" \ + CXXFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" WRKSRC= ${WRKDIR}/${PORTNAME}4-${PORTVERSION} diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 4eb20d4a756f..73cb226ea3ca 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -7,10 +7,9 @@ PORTNAME= djvulibre PORTVERSION= 3.5.20 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= djvu +MASTER_SITES= SF/djvu MAINTAINER= stas@FreeBSD.org COMMENT?= DjVu viewers, encoders, browser plugin, and utilities @@ -42,7 +41,6 @@ MAN1_EN= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 PORTDOCS= djvu2spec.djvu lizard2002.djvu .if !defined(WITHOUT_X11) -USE_XLIB= yes USE_QT_VER= 3 CONFIGURE_ENV+= QTLIBS="-L${QT_PREFIX}/lib -lqt-mt" MAN1+= djview3.1 nsdejavu.1 diff --git a/graphics/djvulibre/files/patch-configure b/graphics/djvulibre/files/patch-configure index 8ffc666deeb3..ecfe48a92d0c 100644 --- a/graphics/djvulibre/files/patch-configure +++ b/graphics/djvulibre/files/patch-configure @@ -5,7 +5,7 @@ verbose= x_includes=NONE -x_libraries=NONE -+x_libraries=${X11BASE}/lib ++x_libraries=${LOCALBASE}/lib # Installation directory options. # These are left unexpanded so users can "make install exec_prefix=/foo" diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile index 4cc3af5a0c30..12ea376eedd9 100644 --- a/graphics/dore/Makefile +++ b/graphics/dore/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdore PORTVERSION= 6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -16,8 +16,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= The Dynamic Object Rendering Environment +USE_XORG= x11 USE_GMAKE= yes -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/dore EXTRACT_CMD= ${MKDIR} ${WRKSRC}; cd ${WRKSRC}; ${GZIP_CMD} MAKEFILE= mk.stdx diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile index 2c804b913773..b62bc3f883fc 100644 --- a/graphics/dynamechs/Makefile +++ b/graphics/dynamechs/Makefile @@ -11,21 +11,18 @@ PORTVERSION= 4.0.p1 PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org COMMENT= A Multibody Dynamic Simulation Library -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_BZIP2= yes -USE_GL= yes +USE_GL= glut USE_GMAKE= yes USE_PERL5_BUILD=yes -MAKE_ENV= OPENGLINCDIR="${X11BASE}/include" \ - OPENGLLIBDIR="${X11BASE}/lib" \ +MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \ + OPENGLLIBDIR="${LOCALBASE}/lib" \ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" ALL_TARGET= freebsd diff --git a/graphics/dynamechs/files/make.platform.freebsd b/graphics/dynamechs/files/make.platform.freebsd index bb72a9bbe9b9..17c2f959b6b4 100644 --- a/graphics/dynamechs/files/make.platform.freebsd +++ b/graphics/dynamechs/files/make.platform.freebsd @@ -2,7 +2,7 @@ CXXFLAGS += -D_BOOL -c -fPIC -I/$(OPENGLINCDIR) # -pthreads DEPENDFLAGS := $(CXXFLAGS) -LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${X11BASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL +LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL LDGLUT := -lglut # CXX := c++ diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index c3e63ec9f9a5..52f0745d9c4d 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -7,7 +7,7 @@ PORTNAME= electriceyes PORTVERSION= 0.3.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/ee/0.3 @@ -16,7 +16,6 @@ DISTNAME= ee-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= A graphic view base imlib & gtk -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs USE_GETTEXT= yes diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index a671aac2b335..048c46616f9a 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -9,8 +9,7 @@ PORTNAME= enblend PORTVERSION= 3.0 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= vd@FreeBSD.org COMMENT= A tool for image blending with multiresolution splines @@ -19,12 +18,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/pool/pool.hpp:${PORTSDIR}/devel/boost LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \ jpeg.9:${PORTSDIR}/graphics/jpeg \ lcms:${PORTSDIR}/graphics/lcms \ - glut.4:${PORTSDIR}/graphics/libglut \ xmi.1:${PORTSDIR}/graphics/plotutils \ tiff.4:${PORTSDIR}/graphics/tiff USE_GNOME= gnometarget -USE_GL= yes +USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -32,8 +30,8 @@ MAN1= enblend.1 PLIST_FILES= bin/enblend CPPFLAGS= -I${WRKSRC}/src/vigra_impex -I${WRKSRC}/include \ - -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|-ffast-math||g ; \ diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index 6484fe802fbe..73e642ee8f09 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -7,7 +7,7 @@ PORTNAME= enfle PORTVERSION= 20010130 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://enfle.fennel.org/files/stable/ @@ -20,8 +20,8 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ ungif.5:${PORTSDIR}/graphics/libungif \ arc.1:${PORTSDIR}/archivers/libarc +USE_XORG= x11 xext USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_PERL5_BUILD=yes CONFIGURE_ARGS= --enable-all-plugins \ diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index f8dca4e3574b..602a8572310b 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -8,6 +8,7 @@ PORTNAME= eog PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +23,6 @@ USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \ gnomedesktop INSTALLS_ICONS= yes USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index 06ee9f804128..680384ab1579 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -24,8 +24,8 @@ INSTALLS_ICONS= yes USE_ICONV= yes USE_GMAKE= yes USE_GNOME= gtk20 intlhack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 4b7db8be6d2f..c28c6da6158c 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -8,7 +8,7 @@ PORTNAME= evince PORTVERSION= 2.22.1.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,7 +24,6 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes INSTALLS_OMF= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui desktopfileutils \ diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile index bf14723598c1..44391f45e83e 100644 --- a/graphics/exhibit/Makefile +++ b/graphics/exhibit/Makefile @@ -35,7 +35,7 @@ PLIST_DIRS= %%DATADIR%% USE_EFL+= engrave .endif -.if defined(WITH_ENLIGHTENMENT) || exists(${X11BASE}/bin/enlightenment_remote) +.if defined(WITH_ENLIGHTENMENT) || exists(${LOCALBASE}/bin/enlightenment_remote) BUILD_DEPENDS+= enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel RUN_DEPENDS+= enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel .endif diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index fa1bc44ae221..1acce4003ec8 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -7,7 +7,7 @@ PORTNAME= feh PORTVERSION= 1.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ @@ -16,7 +16,7 @@ COMMENT= An image viewer that utilizes Imlib2 LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib -USE_X_PREFIX= yes +USE_XORG= x11 xt xinerama USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -24,8 +24,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= feh.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${PERL} -pi.bak -e \ diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile index 97169e52c902..c412f020e819 100644 --- a/graphics/ffff/Makefile +++ b/graphics/ffff/Makefile @@ -9,27 +9,24 @@ PORTNAME= ffff PORTVERSION= 323 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SFE DISTNAME= FFFF${PORTVERSION}-src MAINTAINER= rossiya@gmail.com COMMENT= A fast mandelbrot fractal generator -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut USE_DOS2UNIX= yes -USE_GCC= 3.2+ -USE_GL= yes +USE_GL= glut USE_ZIP= yes SOURCE= FFFF3 FragmentProgram FragmentProgramARB10 GPUProgram \ PixelBuffer VertexProgram VertexProgramATI VertexProgramNV \ extensions vpext -CXXFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/GL ${PTHREAD_CFLAGS} \ +CXXFLAGS+= -I${LOCALBASE}/include/GL ${PTHREAD_CFLAGS} \ -D__linux__ -LDFLAGS+= -L${X11BASE}/lib ${PTHREAD_LIBS} -lglut -lGL -lXext -lX11 -lXmu \ +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lglut -lGL -lXext -lX11 -lXmu \ -lGLU -lm PLIST_FILES= bin/ffff diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile index 3012f37b817e..5f08d37d39f5 100644 --- a/graphics/flashplayer/Makefile +++ b/graphics/flashplayer/Makefile @@ -7,10 +7,9 @@ PORTNAME= flashplayer PORTVERSION= 0.4.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gplflash +MASTER_SITES= SF/gplflash DISTNAME= gplflash-${PORTVERSION} MAINTAINER= llwang@infor.org @@ -20,8 +19,8 @@ LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash WRKSRC= ${WRKDIR}/${DISTNAME}/player USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= x11 xaw xkbfile CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 67dc949d1c0b..b3e45a10f458 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -7,16 +7,14 @@ PORTNAME= fnlib PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= enlightenment +MASTER_SITES= SF/enlightenment MAINTAINER= ports@FreeBSD.org COMMENT= Fonts and font libraries necessary for Enlightenment USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 3496298a52e1..b8825a884780 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -9,8 +9,7 @@ PORTNAME= freeglut PORTVERSION= 2.4.0 PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library @@ -23,10 +22,8 @@ USE_LDCONFIG= yes USE_XORG= ice USE_GL= glu CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ - --disable-warnings -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-lusbhid" +CONFIGURE_ARGS= --disable-warnings +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-lusbhid" REINPLACE_ARGS= -i "" diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile index 4252f8096359..68cd9a92d748 100644 --- a/graphics/frontline/Makefile +++ b/graphics/frontline/Makefile @@ -7,10 +7,9 @@ PORTNAME= frontline PORTVERSION= 0.5.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= autotrace +MASTER_SITES= SF/autotrace MAINTAINER= gnome@FreeBSD.org COMMENT= An autotrace GUI FRONTend like streamLINE(TM) @@ -19,7 +18,6 @@ LIB_DEPENDS= autotrace.3:${PORTSDIR}/graphics/autotrace \ popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomelibs imlib libartlgpl2 USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile index 52558461ad7f..2158ea4bc0fa 100644 --- a/graphics/ftgl/Makefile +++ b/graphics/ftgl/Makefile @@ -7,7 +7,7 @@ PORTNAME= ftgl PORTVERSION= 2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://opengl.geek.nz/ftgl/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/([[:digit:]])$/.\1/} @@ -19,13 +19,12 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME:U} CONFIGURE_WRKSRC= ${WRKSRC}/unix CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-gl-inc=${X11BASE}/include --with-gl-lib=${X11BASE}/lib +CONFIGURE_ARGS= --with-gl-inc=${LOCALBASE}/include --with-gl-lib=${LOCALBASE}/lib BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} MAKE_ENV= MKDIR="${MKDIR}" @@ -47,7 +46,6 @@ post-install: s|%%CFLAGS%%|${CFLAGS}|g; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ <${FILESDIR}/makefile.ex >${EXAMPLESDIR}/makefile diff --git a/graphics/ftgl/files/makefile.ex b/graphics/ftgl/files/makefile.ex index 87cb60068063..791f527a0a19 100644 --- a/graphics/ftgl/files/makefile.ex +++ b/graphics/ftgl/files/makefile.ex @@ -6,9 +6,9 @@ CC= %%CC%% CXX= %%CXX%% RM= %%RM%% -CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL -CXXFLAGS= %%CXXFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL -LDFLAGS= -L%%X11BASE%%/lib -L%%PREFIX%%/lib -lglut -lftgl +CFLAGS= %%CFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include/FTGL +CXXFLAGS= %%CXXFLAGS%% -I. -I%%LOCALBASE%%/include -I%%PREFIX%%/include/FTGL +LDFLAGS= -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib -lglut -lftgl FREETYPE_CFLAGS!=%%LOCALBASE%%/bin/freetype-config --cflags FREETYPE_LFLAGS!=%%LOCALBASE%%/bin/freetype-config --libs diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile index 37127636bd11..92df1153dcd6 100644 --- a/graphics/g2/Makefile +++ b/graphics/g2/Makefile @@ -7,7 +7,7 @@ PORTNAME= g2 PORTVERSION= 0.40 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= libs/graphics @@ -17,7 +17,7 @@ COMMENT= An easy to use, portable and powerful 2D graphics library LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd -USE_XLIB= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" diff --git a/graphics/g3dviewer/Makefile b/graphics/g3dviewer/Makefile index 5f9fb03b1deb..9457b0034c32 100644 --- a/graphics/g3dviewer/Makefile +++ b/graphics/g3dviewer/Makefile @@ -18,14 +18,14 @@ COMMENT= A 3D file viewer for GTK+ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext USE_GNOME= gnometarget gtk20 -USE_GL= yes +USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= g3dviewer.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile index cfdc73a2b9d4..47b7fd1d13b8 100644 --- a/graphics/gauche-gl/Makefile +++ b/graphics/gauche-gl/Makefile @@ -8,8 +8,7 @@ PORTNAME= gl PORTVERSION= 0.4.4 CATEGORIES= graphics scheme -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gauche +MASTER_SITES= SF PKGNAMEPREFIX= gauche- DISTNAME= Gauche-${PORTNAME}-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -18,13 +17,10 @@ MAINTAINER= erik@smluc.org COMMENT= OpenGL binding for Gauche BUILD_DEPENDS= gosh:${PORTSDIR}/lang/gauche -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut RUN_DEPENDS= ${BUILD_DEPENDS} USE_GL= glut GNU_CONFIGURE= yes -USE_GCC= 3.4+ -CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib EXAMPLESDIR= ${PREFIX}/share/examples/gauche/${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/gauche/${PORTNAME} diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile index 68fc555057a8..09d080dab7d1 100644 --- a/graphics/gcolor/Makefile +++ b/graphics/gcolor/Makefile @@ -7,16 +7,14 @@ PORTNAME= gcolor PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= GTK-based color picker PLIST_FILES= bin/gcolor -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 9ff30f22c52c..2b0514993e0c 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -7,7 +7,7 @@ PORTNAME?= gdk-pixbuf PORTVERSION= 0.22.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22 @@ -23,6 +23,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_GMAKE= yes +USE_XORG= xt xi x11 USE_GNOME+= gnomehack gtk12 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile index 6e98053a3593..5defbf9e5600 100644 --- a/graphics/geist/Makefile +++ b/graphics/geist/Makefile @@ -20,8 +20,8 @@ XML_CONFIG?= ${LOCALBASE}/bin/xml2-config GNU_CONFIGURE= yes USE_GNOME= gtk12 USE_EFL= imlib2 -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" \ XML_CONFIG="${XML_CONFIG}" post-patch: diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index a9f089ec6298..cdfee4dd5043 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -7,23 +7,20 @@ PORTNAME= geomview PORTVERSION= 1.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= geomview +MASTER_SITES= SF/geomview MAINTAINER= bms@FreeBSD.org COMMENT= An interactive viewer for 3- and 4-D geometric objects -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_MOTIF= yes -USE_X_PREFIX= yes +USE_XORG= glut USE_AUTOTOOLS= autoconf:213 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-opengl=${X11BASE} +CONFIGURE_ARGS= --with-opengl=${LOCALBASE} MANCOMPRESSED= no MAN1= geomview.1 togeomview.1 bdy.1 oogl2rib.1 anytooff.1 \ diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile index 0f92f24cf30f..64edc5a961c1 100644 --- a/graphics/gephex/Makefile +++ b/graphics/gephex/Makefile @@ -25,11 +25,10 @@ CONFIGURE_ARGS= --without-V4L --without-ASOUNDLIB --without-LINUX_JOYSTICK \ --without-FFMPEG --without-AVIFILE --without-MPEG3 \ --without-LIBPNG --without-SDL --without-SDL_IMAGE \ --without-SDL_TTF --without-AALIB --disable-static \ - --with-qt-libdir="${X11BASE}/lib" \ - --with-qt-incdir="${X11BASE}/include" \ - --with-qt-bindir="${X11BASE}/bin" + --with-qt-libdir="${LOCALBASE}/lib" \ + --with-qt-incdir="${LOCALBASE}/include" \ + --with-qt-bindir="${LOCALBASE}/bin" USE_QT_VER= 3 -USE_XLIB= yes WANT_SDL= yes USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME}-${PORTVERSION:R} @@ -64,7 +63,7 @@ WITH_MPEG3= yes WITH_PNG= yes .endif -.if exists(${X11BASE}/lib/libGL.so) && !defined(WITHOUT_GL) +.if exists(${LOCALBASE}/lib/libGL.so) && !defined(WITHOUT_GL) WITH_GL= yes .endif @@ -172,7 +171,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|; \ - s|%%X11BASE%%|${X11BASE}|; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%PORTDOCS%%|${DO_DOCS}|' ${WRKSRC}/Makefile.am diff --git a/graphics/gephex/files/patch-configure.ac b/graphics/gephex/files/patch-configure.ac index 4d981a0194cf..9b59a1308efa 100644 --- a/graphics/gephex/files/patch-configure.ac +++ b/graphics/gephex/files/patch-configure.ac @@ -17,7 +17,7 @@ # optional libraries +ac_save_CFLAGS="$CFLAGS" -+CFLAGS="${CFLAGS} -I%%X11BASE%%/include" ++CFLAGS="${CFLAGS} -I%%LOCALBASE%%/include" + CHECK_EXTRA_LIB([GL], [AC_CHECK_HEADER([GL/glx.h],have_gl=yes,have_gl=no)], diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile index 40706b3d721d..bb25a6585d09 100644 --- a/graphics/giftrans/Makefile +++ b/graphics/giftrans/Makefile @@ -27,7 +27,7 @@ do-extract: done post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/giftrans.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/giftrans.c do-build: (cd ${WRKSRC}; ${CC} ${CFLAGS} giftrans.c -o giftrans) diff --git a/graphics/giftrans/files/patch-aa b/graphics/giftrans/files/patch-aa index 65752726593a..26b44f545290 100644 --- a/graphics/giftrans/files/patch-aa +++ b/graphics/giftrans/files/patch-aa @@ -5,7 +5,7 @@ #ifndef RGBTXT #ifdef X11 -#define RGBTXT "/usr/lib/X11/rgb.txt" -+#define RGBTXT "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGBTXT "%%LOCALBASE%%/lib/X11/rgb.txt" #else /* X11 */ #ifdef OPENWIN #define RGBTXT "/usr/openwin/lib/rgb.txt" diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 2be26a7ba6e6..01efdf5418c3 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -8,7 +8,7 @@ PORTNAME= gimp-app DISTVERSION= 2.4.5 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -36,7 +36,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ USE_BZIP2= yes USE_GETTEXT= yes -USE_XPM= yes +USE_XORG= xpm xmu xext USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile index 2d63d94c4aa3..c4e95c9024e0 100644 --- a/graphics/gimp-manual-html/Makefile +++ b/graphics/gimp-manual-html/Makefile @@ -33,7 +33,6 @@ pre-everything:: @${ECHO_MSG} "This manual is available in two formats: HTML and PDF." @${ECHO_MSG} "Note that the manual is pretty darn big." -PREFIX?= ${X11BASE} # This port itself does not require Xlib EXTRACT_ONLY= #empty NO_BUILD= yes diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 9cb82437766e..cb50d5cc73e8 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimpshop PORTVERSION= 2.2.11 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics gnome MASTER_SITES= http://www.plasticbugs.com/blogimg/ \ http://freebsd.powered.net/distfiles/ @@ -28,15 +28,14 @@ CONFLICTS= gimp-1.* gimp-2.* gimp-gnome-2.* SHLIBVER?= 200 USE_BZIP2= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm x11 ice xmu USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 \ desktopfileutils WANT_GNOME= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= SHLIBVER="${SHLIBVER}" CONFIGURE_ARGS= --disable-perl \ --with-html-dir=${DOCSDIR} \ @@ -44,8 +43,8 @@ CONFIGURE_ARGS= --disable-perl \ --enable-static \ --disable-print \ --with-desktop-dir=${LOCALBASE}/share -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/gimp-${PORTVERSION} diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile index a42032756360..f704d5ae785e 100644 --- a/graphics/gkrellkam/Makefile +++ b/graphics/gkrellkam/Makefile @@ -7,22 +7,20 @@ PORTNAME= gkrellkam PORTVERSION= 0.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM plugin that display thumbnails of periodically updated images -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm NO_LATEST_LINK= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} -USE_X_PREFIX= yes USE_GNOME= imlib USE_GMAKE= yes diff --git a/graphics/gkrellkam/files/patch-Makefile b/graphics/gkrellkam/files/patch-Makefile index f6374642bcf7..7c9e04268ebd 100644 --- a/graphics/gkrellkam/files/patch-Makefile +++ b/graphics/gkrellkam/files/patch-Makefile @@ -10,7 +10,7 @@ -CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I$(GKRELLM_HDRS) +GTKFLAGS = `${GTK_CONFIG} --cflags` +IMLIBFLAGS = `${IMLIB_CONFIG} --cflags-gdk` -+CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I${X11BASE}/include/gkrellm ++CFLAGS += -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I${LOCALBASE}/include/gkrellm LDFLAGS := -shared -Wl INST_DIR := $(DESTDIR)/usr/lib/gkrellm/plugins USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm/plugins diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile index f532059bf3c6..cc3ced8f58d3 100644 --- a/graphics/gkrellkam2/Makefile +++ b/graphics/gkrellkam2/Makefile @@ -8,20 +8,18 @@ PORTNAME= gkrellkam PORTVERSION= 2.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= GKrellM plugin that display thumbnails of periodically updated images -BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_X_PREFIX= yes USE_GMAKE= yes LATEST_LINK= gkrellkam2 diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index f8baa0c65039..dcdba2a0d267 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -9,7 +9,7 @@ PORTNAME= gle PORTVERSION= 3.1.0 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF\ http://linas.org/gle/pub/ \ http://metalab.unc.edu/pub/Linux/libs/X/ \ ftp://tsx-11.mit.edu/pub/linux/sources/libs/ @@ -18,12 +18,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@dclg.ca COMMENT= A GL Tubing and Extrusion Library -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_GL= glut USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= "LIBS=-L${X11BASE}/lib -lXext ${PTHREAD_LIBS}" +CONFIGURE_ENV= "LIBS=-L${LOCALBASE}/lib -lXext ${PTHREAD_LIBS}" MAN3= gle.3gle gleExtrusion.3gle gleHelicoid.3gle gleLathe.3gle \ glePolyCone.3gle glePolyCylinder.3gle gleScrew.3gle \ diff --git a/graphics/glean/files/patch-common.mak b/graphics/glean/files/patch-common.mak index c43083b4c0af..d2681476445c 100644 --- a/graphics/glean/files/patch-common.mak +++ b/graphics/glean/files/patch-common.mak @@ -26,12 +26,12 @@ - GLUTLIB:=/usr/lib - TIFFINC:=#-I/usr/include - TIFFLIB:=/usr/lib -+ XINC:=-I${X11BASE}/include -+ XLIB:=${X11BASE}/lib -+ GLINC:=-I${X11BASE}/include -+ GLLIB:=${X11BASE}/lib -+ GLUTINC:=-I${X11BASE}/include -+ GLUTLIB:=${X11BASE}/lib ++ XINC:=-I${LOCALBASE}/include ++ XLIB:=${LOCALBASE}/lib ++ GLINC:=-I${LOCALBASE}/include ++ GLLIB:=${LOCALBASE}/lib ++ GLUTINC:=-I${LOCALBASE}/include ++ GLUTLIB:=${LOCALBASE}/lib + TIFFINC:=-I${LOCALBASE}/include + TIFFLIB:=${LOCALBASE}/lib EXTRALIBS:= diff --git a/graphics/glew/files/patch-config_Makefile.freebsd b/graphics/glew/files/patch-config_Makefile.freebsd index 2ce5d93a5a39..b765952f3362 100644 --- a/graphics/glew/files/patch-config_Makefile.freebsd +++ b/graphics/glew/files/patch-config_Makefile.freebsd @@ -14,12 +14,12 @@ $FreeBSD$ endif LDFLAGS.SO = -shared -soname $(LIB.SONAME) -LDFLAGS.EXTRA = -L/usr/X11R6/lib -+LDFLAGS.EXTRA = -L${X11BASE}/lib ++LDFLAGS.EXTRA = -L${LOCALBASE}/lib LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic -CFLAGS.EXTRA += -I/usr/X11R6/include -+CFLAGS.EXTRA += -I${X11BASE}/include -fPIC ++CFLAGS.EXTRA += -I${LOCALBASE}/include -fPIC NAME = GLEW WARN = -Wall -W POPT = -O2 diff --git a/graphics/glexcess/Makefile b/graphics/glexcess/Makefile index aea3233713cf..62751a9c98ec 100644 --- a/graphics/glexcess/Makefile +++ b/graphics/glexcess/Makefile @@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME} MAINTAINER= hernan.di.pietro@gmail.com COMMENT= An impressive OpenGL Demo -LIB_DEPENDS= glut:${PORTSDIR}/graphics/libglut -USE_GL= yes +USE_GL= glut -MAKE_ARGS= 'CXXFLAGS=${CXXFLAGS} -I${X11BASE}/include -pipe -s -O2' \ - 'LDFLAGS=-L${X11BASE}/lib -lGL -lglut' +MAKE_ARGS= 'CXXFLAGS=${CXXFLAGS} -I${LOCALBASE}/include -pipe -s -O2' \ + 'LDFLAGS=-L${LOCALBASE}/lib -lGL -lglut' post-patch: @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/scene*.cpp diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index e1f0fe06fee9..ee0e810f0eac 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -24,7 +24,6 @@ do-configure: @(cd ${WRKSRC} && \ ${SETENV} CC="${CC}" \ CFLAGS="${CFLAGS}" \ - X11BASE="${X11BASE}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" ./compile.sh) do-install: diff --git a/graphics/glfw/files/patch-compile.sh b/graphics/glfw/files/patch-compile.sh index 6097ed6d0ede..6428fd309850 100644 --- a/graphics/glfw/files/patch-compile.sh +++ b/graphics/glfw/files/patch-compile.sh @@ -22,10 +22,10 @@ - LFLAGS="$LFLAGS -L/usr/X11R6/lib" - INCS="-I/usr/X11R6/include" - echo " X11 libraries location: /usr/X11R6/lib" 1>&6 -+elif [ -r "${X11BASE}/lib" ]; then -+ LFLAGS="$LFLAGS -L${X11BASE}/lib" -+ INCS="-I${X11BASE}/include" -+ echo " X11 libraries location: ${X11BASE}/lib" 1>&6 ++elif [ -r "${LOCALBASE}/lib" ]; then ++ LFLAGS="$LFLAGS -L${LOCALBASE}/lib" ++ INCS="-I${LOCALBASE}/include" ++ echo " X11 libraries location: ${LOCALBASE}/lib" 1>&6 # X11R5 in /usr/X11R5/lib ? elif [ -r "/usr/X11R5/lib" ]; then LFLAGS="$LFLAGS -L/usr/X11R5/lib" @@ -46,7 +46,7 @@ int main() {; return 0;} EOF -+CFLAGS="${CFLAGS} -I${X11BASE}/include" ++CFLAGS="${CFLAGS} -I${LOCALBASE}/include" + if { (eval echo $config_script: \"$compile\") 1>&5; (eval $compile) 2>&5; }; then rm -rf conftest* diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile index 3108e890f72b..1ca854230dee 100644 --- a/graphics/glide3/Makefile +++ b/graphics/glide3/Makefile @@ -7,7 +7,7 @@ PORTNAME= glide3 PORTVERSION= 20020113 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://people.freebsd.org/~anholt/dri/files/ DISTNAME= Glide3-FreeBSD-${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= Library to support 3dfx Voodoo3/4/5/Banshee with the DRI USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= x11 xxf86dga xxf86vm USE_LDCONFIG= yes USE_AUTOTOOLS= automake:14 autoconf:261 libtool:15 AUTOMAKE_ARGS= -a diff --git a/graphics/glide3/files/patch-h3-src-makefile b/graphics/glide3/files/patch-h3-src-makefile index be64c681301d..6a1e96ef8549 100644 --- a/graphics/glide3/files/patch-h3-src-makefile +++ b/graphics/glide3/files/patch-h3-src-makefile @@ -73,7 +73,7 @@ $(top_builddir)/swlibs/newpci/pcilib/libfxpci.la \ $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la -LINK_LIBS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -+LINK_LIBS = -L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm ++LINK_LIBS = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm CLEANFILES = fxinline.h fxgasm.h diff --git a/graphics/glide3/files/patch-h5-src-makefile b/graphics/glide3/files/patch-h5-src-makefile index c6ea0725e156..42f094b48241 100644 --- a/graphics/glide3/files/patch-h5-src-makefile +++ b/graphics/glide3/files/patch-h5-src-makefile @@ -70,7 +70,7 @@ $(top_builddir)/swlibs/$(TEXTURE_UTILITIES_DIR)/lib/libtexus.la \ $(top_builddir)/@FX_GLIDE_HW@/minihwc/libminihwc.la -LINK_LIBS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm -+LINK_LIBS = -L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm ++LINK_LIBS = -L$(LOCALBASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lm CLEANFILES = fxinline.h fxgasm.h diff --git a/graphics/glide3/files/patch-make-3dfx_mak b/graphics/glide3/files/patch-make-3dfx_mak index 272aabf0b999..02d615f19bd9 100644 --- a/graphics/glide3/files/patch-make-3dfx_mak +++ b/graphics/glide3/files/patch-make-3dfx_mak @@ -5,7 +5,7 @@ ifeq "$(OS)" "FreeBSD" -GCINCS = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I/usr/X11R6/include -+GCINCS = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I$(X11BASE)/include ++GCINCS = -I. -I$(BUILD_ROOT_SWLIBS)/include -I$(BUILD_ROOT_HW)/include -I$(LOCALBASE)/include GCOPTS = -Wall -# -# BIG_OPT Indicates O3(?) or better is being used. It changes the diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile index cbc50bcc2e4f..a4c266ff0bfe 100644 --- a/graphics/glpng/Makefile +++ b/graphics/glpng/Makefile @@ -18,7 +18,7 @@ COMMENT= Library to easily load PNG files as an OpenGL textures LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_GL= yes +USE_GL= gl USE_ZIP= yes USE_LDCONFIG= yes @@ -30,8 +30,8 @@ post-patch: @${REINPLACE_CMD} -e 's|png/|libpng/|' ${WRKSRC}/glpng.c do-build: - ${CC} ${CFLAGS} -fPIC -I${X11BASE}/include -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c - ${CC} ${CFLAGS} -fPIC -L${X11BASE}/lib -L${LOCALBASE}/lib -shared -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o + ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c + ${CC} ${CFLAGS} -fPIC -L${LOCALBASE}/lib -shared -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o ${AR} cqs ${WRKSRC}/libglpng.a ${WRKSRC}/libglpng.o do-install: diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile index ae6e297460d1..7bbd5619fcd9 100644 --- a/graphics/gltt/Makefile +++ b/graphics/gltt/Makefile @@ -7,29 +7,27 @@ PORTNAME= gltt PORTVERSION= 2.5.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://gltt.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org COMMENT= TrueType fonts rendering using OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes +USE_GL= gl glut USE_FREETYPE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-ttf-includes=${LOCALBASE}/include/freetype1 \ --with-ttf-libraries=${LOCALBASE}/lib \ - --with-gl-includes=${X11BASE}/include \ - --with-gl-libraries=${X11BASE}/lib \ - --with-glut-includes=${X11BASE}/include \ - --with-glut-libraries=${X11BASE}/lib + --with-gl-includes=${LOCALBASE}/include \ + --with-gl-libraries=${LOCALBASE}/lib \ + --with-glut-includes=${LOCALBASE}/include \ + --with-glut-libraries=${LOCALBASE}/lib USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index d76773901c65..f83eac2fbf6d 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -165,7 +165,7 @@ post-patch: @${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ - s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure \ + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist .if !defined(WITH_DEBUGLOG) @${REINPLACE_CMD} -e 's|gnash-dbg.log|/dev/null|' \ diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index d76773901c65..f83eac2fbf6d 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -165,7 +165,7 @@ post-patch: @${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ - s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure \ + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist .if !defined(WITH_DEBUGLOG) @${REINPLACE_CMD} -e 's|gnash-dbg.log|/dev/null|' \ diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index 991cd436c123..c549d0ab9ebe 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnomeiconedit PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= giconedit +MASTER_SITES= SF/giconedit DISTNAME= gnome-iconedit-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -18,7 +17,6 @@ COMMENT= A small GNOME Icon Editor USE_GNOME= gnomeprefix gnomehack bonobo gnomeprint USE_GMAKE= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/goom/pkg-plist b/graphics/goom/pkg-plist index b34368dbf121..f2b06eec13ce 100644 --- a/graphics/goom/pkg-plist +++ b/graphics/goom/pkg-plist @@ -15,6 +15,5 @@ lib/libgoom2.la lib/libgoom2.so lib/libgoom2.so.0 libdata/pkgconfig/libgoom2.pc -%%XMMS%%@cwd %%X11BASE%% %%XMMS%%lib/xmms/Visualization/libxmmsgoom2.so @dirrm include/goom diff --git a/graphics/gozer/Makefile b/graphics/gozer/Makefile index d587892404e1..3038ead2bef4 100644 --- a/graphics/gozer/Makefile +++ b/graphics/gozer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gozer PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://linuxbrit.co.uk/downloads/ @@ -16,10 +16,9 @@ COMMENT= Commandline text rendering utility - creates images from text LIB_DEPENDS= giblib.1:${PORTSDIR}/graphics/giblib -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-porbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-giblib-prefix=${X11BASE} +CONFIGURE_ARGS= --with-giblib-prefix=${LOCALBASE} MAN1= gozer.1 diff --git a/graphics/gplot/files/patch-aa b/graphics/gplot/files/patch-aa index 4ee863241eae..d228ef526476 100644 --- a/graphics/gplot/files/patch-aa +++ b/graphics/gplot/files/patch-aa @@ -249,18 +249,18 @@ - /usr/include/X11/StringDefs.h \ - /usr/include/X11/Xutil.h \ - /usr/include/X11/cursorfont.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/StringDefs.h \ -+ $(X11BASE)/include/X11/Xutil.h \ -+ $(X11BASE)/include/X11/cursorfont.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/StringDefs.h \ ++ $(LOCALBASE)/include/X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/cursorfont.h \ defs.h xws_defs.h xws_delim.o: /usr/include/stdio.h \ /usr/include/strings.h \ - /usr/include/X11/Intrinsic.h \ - /usr/include/X11/Xutil.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Xutil.h \ defs.h xws_defs.h xws_color.o: /usr/include/stdio.h \ @@ -268,35 +268,35 @@ - /usr/include/X11/Intrinsic.h \ - /usr/include/X11/Xutil.h \ - /usr/include/X11/Xatom.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include//X11/Xutil.h \ -+ $(X11BASE)/include/X11/Xatom.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include//X11/Xutil.h \ ++ $(LOCALBASE)/include/X11/Xatom.h \ defs.h xws_defs.h xws_color.h -xws_polyline.o:/usr/include/X11/Intrinsic.h \ -+xws_polyline.o:$(X11BASE)/include/X11/Intrinsic.h \ ++xws_polyline.o:$(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_polygon.o: /usr/include/stdio.h \ - /usr/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_fill.h -xws_marker.o: /usr/include/X11/Intrinsic.h \ -+xws_marker.o: $(X11BASE)/include/X11/Intrinsic.h \ ++xws_marker.o: $(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_text.o: /usr/include/strings.h \ - /usr/include/X11/Intrinsic.h \ - /usr/include/X11/Xatom.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Xatom.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Xatom.h \ defs.h xws_defs.h xws_cla.o: /usr/include/stdio.h \ /usr/include/math.h \ - /usr/include/X11/Intrinsic.h \ -+ $(X11BASE)/include/X11/Intrinsic.h \ ++ $(LOCALBASE)/include/X11/Intrinsic.h \ defs.h xws_defs.h xws_color.h #----------------------------------------------------------------------------- # DrawCGM and CGMGen, and test routines diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 986a3beb8fb8..dff64438c8c3 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -20,7 +20,7 @@ MAINTAINER= glewis@FreeBSD.org COMMENT= The Grid Analysis and Display System BUILD_DEPENDS= ${LOCALBASE}/lib/libudunits.a:${PORTSDIR}/science/udunits \ - ${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx + ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index 2c549074791a..f66d5daa59f0 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -21,7 +21,7 @@ USE_XORG= x11 USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \ - --with-x11-base=${X11BASE} + --with-x11-base=${LOCALBASE} CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib ALL_TARGET= libs diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile index 7d3b7d16136d..11f4c874c2e7 100644 --- a/graphics/gsnapshot/Makefile +++ b/graphics/gsnapshot/Makefile @@ -7,6 +7,7 @@ PORTNAME= gsnapshot PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -16,6 +17,7 @@ COMMENT= A gtk+ based screen capture USE_AUTOTOOLS= automake:15:env libtool:15 USE_GNOME= gtk20 GNU_CONFIGURE= yes +USE_XORG= x11 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index ac13c91c9b60..60f47a4e8f1d 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -7,6 +7,7 @@ PORTNAME= gthumb PORTVERSION= 2.10.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 @@ -18,7 +19,6 @@ COMMENT= An image viewer and browser for the GNOME 2 environment LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui gnomedocutils diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index c8b4c51e1555..e6996d41edf5 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -7,10 +7,9 @@ PORTNAME= gtkam PORTVERSION= 0.1.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gphoto +MASTER_SITES= SF/gphoto MAINTAINER= pav@FreeBSD.org COMMENT= Download and view files from various digital cameras @@ -18,7 +17,6 @@ COMMENT= Download and view files from various digital cameras LIB_DEPENDS= exif-gtk.5:${PORTSDIR}/graphics/libexif-gtk \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 -USE_XLIB= yes WANT_GNOME= yes USE_GNOME= gnomehack gnomehier gnometarget gtk20 GNU_CONFIGURE= yes diff --git a/graphics/gtkcairo/Makefile b/graphics/gtkcairo/Makefile index eba78f744d0d..3a2dc6e6ff11 100644 --- a/graphics/gtkcairo/Makefile +++ b/graphics/gtkcairo/Makefile @@ -22,8 +22,8 @@ USE_BZIP2= yes USE_GNOME= gtk20 gnometarget gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= include/gtkcairo.h \ lib/libgtkcairo.a \ diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile index ca33235437ac..c1450409c71e 100644 --- a/graphics/gtkfig/Makefile +++ b/graphics/gtkfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkfig PORTVERSION= 0.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \ http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Figure-drawing tool PLIST_FILES= bin/gtkfig -USE_X_PREFIX= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index 0daeea3abff0..8b293a9dd86f 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkgraph PORTVERSION= 0.6.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jedgar @@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= jedgar MAINTAINER= ports@FreeBSD.org COMMENT= Graphing calculator using GTK+ -USE_X_PREFIX= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= imlib diff --git a/graphics/gts/Makefile b/graphics/gts/Makefile index 29f998453423..39861ae3120d 100644 --- a/graphics/gts/Makefile +++ b/graphics/gts/Makefile @@ -9,8 +9,7 @@ PORTNAME= gts PORTVERSION= 0.7.6 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= erik@smluc.org COMMENT= GNU Triangulated Surface Library @@ -18,7 +17,7 @@ COMMENT= GNU Triangulated Surface Library USE_GNOME= glib20 gnometarget pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes OPTIONS= NETPBM "Build with libnetpbm support" off diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile index ae57b423bec4..1fb18297212d 100644 --- a/graphics/gview/Makefile +++ b/graphics/gview/Makefile @@ -7,14 +7,13 @@ PORTNAME= gview PORTVERSION= 0.1.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://homepages.petech.ac.za/~bruces/ MAINTAINER= ports@FreeBSD.org COMMENT= Image viewer for X Window System with interface similar to ACDSee -USE_X_PREFIX= yes USE_GNOME= gnomehack imlib GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/hs-hgl/Makefile b/graphics/hs-hgl/Makefile index f297f8fd32da..722c5a2795af 100644 --- a/graphics/hs-hgl/Makefile +++ b/graphics/hs-hgl/Makefile @@ -28,7 +28,7 @@ HGL_DOCS= ${PREFIX}/share/doc/hs-hgl BUILD_WRKSRC= ${WRKSRC}/lib/x11 MAKE_ARGS= system=FreeBSD \ hugs_install=${HGL_LIBS} \ - X_dir=${X11BASE} \ + X_dir=${LOCALBASE} \ CC=${CC} ALL_TARGET= all diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile index 69d08d334430..bbf85367f123 100644 --- a/graphics/hsetroot/Makefile +++ b/graphics/hsetroot/Makefile @@ -7,7 +7,7 @@ PORTNAME= hsetroot PORTVERSION= 1.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://thegraveyard.org/files/ @@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Utility to compose wallpapers for X PLIST_FILES= bin/hsetroot -USE_X_PREFIX= YES USE_EFL= imlib2 GNU_CONFIGURE= YES diff --git a/graphics/ida/files/patch-GNUmakefile b/graphics/ida/files/patch-GNUmakefile index a1462656531f..95694de9af38 100644 --- a/graphics/ida/files/patch-GNUmakefile +++ b/graphics/ida/files/patch-GNUmakefile @@ -6,8 +6,8 @@ # for X11 + Motif -CFLAGS += -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/$(LIB) -+CFLAGS += -I$(X11BASE)/include -+LDFLAGS += -L$(X11BASE)/$(LIB) ++CFLAGS += -I$(LOCALBASE)/include ++LDFLAGS += -L$(LOCALBASE)/$(LIB) LDLIBS += -lXm -lXpm -lXt -lXext -lX11 # RegEdit.c is good old K&R ... diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile index 33232d69cd51..77173b1fa3fc 100644 --- a/graphics/imagesort/Makefile +++ b/graphics/imagesort/Makefile @@ -7,7 +7,7 @@ PORTNAME= imagesort PORTVERSION= 2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/X @@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= apps/graphics/viewers/X MAINTAINER= ports@FreeBSD.org COMMENT= A flexible X utility for managing many image files +USE_XORG= x11 xt USE_GNOME= imlib CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include diff --git a/graphics/imagesort/files/patch-Makefile b/graphics/imagesort/files/patch-Makefile index 559dd89e5852..9661331b61f8 100644 --- a/graphics/imagesort/files/patch-Makefile +++ b/graphics/imagesort/files/patch-Makefile @@ -14,7 +14,7 @@ #LIBS = -lImlib -lX11 -lXext -ljpeg -lgif -lm -CFLAGS = -g -L$(XDIR)/lib -I$(XDIR)/include -+CFLAGS += -L$(LOCALBASE)/lib -L$(X11BASE)/lib -I$(X11BASE)/include ++CFLAGS += -L$(LOCALBASE)/lib -I$(LOCALBASE)/include all: imagesort.o diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 5fef0e0d1bb3..3342b6cabfdb 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= imlib PORTVERSION= 1.9.15 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/imlib/1.9 @@ -22,8 +22,8 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ ungif.5:${PORTSDIR}/graphics/libungif USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_BZIP2= yes +USE_XORG= sm xext x11 USE_GMAKE= yes USE_GNOME= gtk12 gnomehack GNU_CONFIGURE= yes diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index d1279b994368..281657cbb67a 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -21,8 +21,8 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GNOME= gnomehack pkgconfig gnometarget -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes OPTIONS= JPEG "Enable jpeg image support" on \ @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --without-x PKGNAMESUFFIX+= -nox11 PLIST_SUB= X11="@comment " .else -USE_XLIB= yes +USE_XORG= x11 sm xext PLIST_SUB= X11="" .endif diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 23aa65a190b6..3db6c2940deb 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -25,9 +25,8 @@ USE_GL= glw USE_GMAKE= yes USE_ICONV= yes USE_MOTIF= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 -#PREFIX= ${X11BASE} # not a good manner WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/lib:${WRKSRC}/libSoXt diff --git a/graphics/inventor/files/patch-ivcommondefs b/graphics/inventor/files/patch-ivcommondefs index bda11238ef45..53aaf37ce68d 100644 --- a/graphics/inventor/files/patch-ivcommondefs +++ b/graphics/inventor/files/patch-ivcommondefs @@ -18,7 +18,7 @@ LCOPTS += $(LINUXOPTS) -X11DIR = /usr/X11R6 -+X11DIR = ${X11BASE} ++X11DIR = ${LOCALBASE} X11INCDIR = $(X11DIR)/include X11LIBDIR = $(X11DIR)/lib @@ -61,7 +61,7 @@ # +ifeq ($(usingFreeBSD), 1) -+IVPREFIX = ${X11BASE} ++IVPREFIX = ${LOCALBASE} +else IVPREFIX = /usr +endif diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index 044e9ba3ece1..7cb052b58200 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -7,7 +7,7 @@ PORTNAME= ipe PORTVERSION= 6.0.p23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://ipe.compgeom.org/ \ http://tclab.kaist.ac.kr/~otfried/Ipe/ @@ -25,7 +25,6 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_QT_VER= 3 MAKE_ENV+= QTDIR=${QTDIR} -USE_XLIB= yes USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib MAN1= figtoipe.1 ipe.1 ipe5toxml.1 ipetoipe.1 ipetopng.1 diff --git a/graphics/irit/Makefile b/graphics/irit/Makefile index 8ac19e25622e..1723a8b3265e 100644 --- a/graphics/irit/Makefile +++ b/graphics/irit/Makefile @@ -7,7 +7,7 @@ PORTNAME= irit PORTVERSION= 9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.cs.technion.ac.il/~irit/ DISTNAME= ${PORTNAME}-sm @@ -23,10 +23,9 @@ BROKEN= Checksum mismatch USE_ZIP= yes USE_GMAKE= yes -USE_XLIB= yes .ifdef (WITH_MOTIF) USE_MOTIF= yes -USE_GL= yes +USE_GL= gl .endif USE_LDCONFIG= yes NO_WRKSUBDIR= yes diff --git a/graphics/irit/files/patch-makeflag.gnux b/graphics/irit/files/patch-makeflag.gnux index 93ae1aa4aef2..de218851640d 100644 --- a/graphics/irit/files/patch-makeflag.gnux +++ b/graphics/irit/files/patch-makeflag.gnux @@ -51,8 +51,8 @@ # -# MESA_INC = -I/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/include -D__MESA__ -D__OPENGL__ -# MESA_LIB = -L/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/lib -lGLU -lGL -+MESA_INC = -I${X11BASE}/include -D__MESA__ -D__OPENGL__ -+MESA_LIB = -L${X11BASE}/lib -lGLU -lGL ++MESA_INC = -I${LOCALBASE}/include -D__MESA__ -D__OPENGL__ ++MESA_LIB = -L${LOCALBASE}/lib -lGLU -lGL # # Support of (shared) libraries. You will need to set the proper suffix @@ -105,7 +105,7 @@ +ifeq ($(WITH_MOTIF_DEF),yes) +DFLAGS+= ${MESA_INC} +else -+DFLAGS+= -D__X11__ -I${X11BASE}/include ++DFLAGS+= -D__X11__ -I${LOCALBASE}/include +endif +CFLAGS += -fPIC $(DFLAGS) # ifeq ($(CFG), Rel) @@ -118,10 +118,10 @@ -# GRAPXMTLIBS = -L/usr/X11R6/lib -lXm -lXt -lX11 -# GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) +MORELIBS = -lc -+GRAPX11LIBS = -L${X11BASE}/lib -lX11 ++GRAPX11LIBS = -L${LOCALBASE}/lib -lX11 +GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) +ifeq ($(WITH_MOTIF_DEF),yes) -+GRAPXMTLIBS = -L${X11BASE}/lib -lXm -lXt -lX11 ++GRAPXMTLIBS = -L${LOCALBASE}/lib -lXm -lXt -lX11 +GRAPOGLLIBS = ${MESA_LIB} ${GRAPXMTLIBS} +GRAPDRVS+= xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF) +endif diff --git a/graphics/isreal/Makefile b/graphics/isreal/Makefile index 760c5a7e4c97..b047a3e892c1 100644 --- a/graphics/isreal/Makefile +++ b/graphics/isreal/Makefile @@ -7,7 +7,7 @@ PORTNAME= isreal PORTVERSION= 2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= markp @@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An image classification utility PLIST_FILES= bin/isreal -USE_XLIB= yes USE_GNOME= imlib CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include diff --git a/graphics/isreal/files/patch-Makefile b/graphics/isreal/files/patch-Makefile index 0e787f8d23be..03227ede7022 100644 --- a/graphics/isreal/files/patch-Makefile +++ b/graphics/isreal/files/patch-Makefile @@ -9,10 +9,10 @@ -CFLAGS = -g -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -+LIBS = -L$(X11BASE)/lib -L/usr/local/lib -lX11 -lXext \ ++LIBS = -L$(LOCALBASE)/lib -L/usr/local/lib -lX11 -lXext \ + -ljpeg -lpng -ltiff -lz -lungif -lm -lImlib + -+CFLAGS += -I$(X11BASE)/include ++CFLAGS += -I$(LOCALBASE)/include VERSION=2.0 diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 002406eb37d5..34de1688b9e8 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -7,19 +7,17 @@ PORTNAME= ivtools PORTVERSION= 1.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= araujo@FreeBSD.org COMMENT= Drawing editors derived from idraw -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff -USE_XLIB= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:261 CONFIGURE_ARGS= --with-tiff=${PREFIX} diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile index e976e6dca0b7..b01f8927bbb8 100644 --- a/graphics/kludge3d/Makefile +++ b/graphics/kludge3d/Makefile @@ -10,8 +10,7 @@ PORTNAME= kludge3d PORTVERSION= 20040822 PORTREVISION= 6 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A simple 3d editor @@ -20,7 +19,7 @@ LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds \ gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext USE_PYTHON= yes -USE_GL= yes +USE_GL= gl USE_GNOME= gnometarget gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes @@ -29,9 +28,9 @@ CONFIGURE_ARGS= --with-lib-GL PLIST_FILES= bin/kludge3d -CPPFLAGS= -I${LOCALBASE}/include -L${X11BASE}/include \ +CPPFLAGS= -I${LOCALBASE}/include \ -I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib \ +LDFLAGS= -L${LOCALBASE}/lib \ -L${PYTHON_LIBDIR}/config ${PTHREAD_LIBS} post-patch: diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile index 47cbc58fa94d..041d0b97546a 100644 --- a/graphics/kudu/Makefile +++ b/graphics/kudu/Makefile @@ -16,13 +16,13 @@ COMMENT= A 3D skeletal animation tool, powered by GTK+ and OpenGL LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext -USE_GL= yes +USE_GL= gl USE_PYTHON= yes USE_BZIP2= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile index 26873dd5a6a1..8b4309a710c9 100644 --- a/graphics/lib3ds/Makefile +++ b/graphics/lib3ds/Makefile @@ -13,13 +13,12 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A library for handling 3DS (3D Studio) files -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_ZIP= yes USE_LDCONFIG= yes +USE_GL= glut GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= 3dsdump.1 lib3ds-config.1 diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index d7b633b79e68..b05eef786dd4 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -32,7 +32,7 @@ USE_LDCONFIG= yes MAKE_ARGS= SHELL=${SH} CFLAGS+= -DUSE_XSHM -DHZ=100 -PREFIX= ${X11BASE} +PREFIX= ${LOCALBASE} FILESDIR= ${.CURDIR}/../../graphics/libGL/files WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} CONFDIR= ${WRKSRC}/configs @@ -66,7 +66,7 @@ FAST_MATH= -ffast-math pre-patch: @${REINPLACE_CMD} \ -e '/^CC =/d' -e '/^CXX =/d' \ - -e 's|/usr/X11R6|${X11BASE}|g' \ + -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|-lpthread|${PTHREAD_LIBS}|g' \ -e 's|-ffast-math|${FAST_MATH}|g' \ @@ -76,9 +76,9 @@ pre-patch: -e 's|-DHAVE_POSIX_MEMALIGN||' \ ${CONFDIR}/freebsd-dri @${REINPLACE_CMD} \ - -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${X11BASE}/include|' \ - -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${X11BASE}/lib|' \ - -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${X11BASE}/lib/dri|' \ + -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${LOCALBASE}/include|' \ + -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${LOCALBASE}/lib|' \ + -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${LOCALBASE}/lib/dri|' \ ${CONFDIR}/default .if !target(do-install) diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile index 6d408e586a25..e45b3a1866a0 100644 --- a/graphics/libafterimage/Makefile +++ b/graphics/libafterimage/Makefile @@ -8,10 +8,9 @@ PORTNAME= libafterimage PORTVERSION= 1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= afterstep +MASTER_SITES= SF/afterstep DISTNAME= libAfterImage-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -26,11 +25,11 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ USE_GNOME= librsvg2 USE_BZIP2= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes +USE_XORG= x11 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-staticlibs --enable-sharedlibs \ --without-builtin-ungif --without-afterbase \ --with-x diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index d0ec8efcaa24..2696b5a368f4 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -7,6 +7,7 @@ PORTNAME= libcaca DISTVERSION= 0.99.beta13 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://libcaca.zoy.org/files/ @@ -31,7 +32,7 @@ MAN1= caca-config.1 cacafire.1 cacaplay.1 cacaserver.1 cacaview.1 \ .if defined(WITHOUT_X11) CONFIGURE_ARGS+=--disable-x11 .else -USE_XLIB= yes +USE_XORG= x11 .endif .if defined(WITHOUT_IMLIB2) diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile index eb58e167f4fe..39b03f22271b 100644 --- a/graphics/libflash/Makefile +++ b/graphics/libflash/Makefile @@ -7,10 +7,9 @@ PORTNAME= libflash PORTVERSION= 0.4.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gplflash +MASTER_SITES= Sf/gplflash DISTNAME= gplflash-${PORTVERSION} MAINTAINER= llwang@infor.org @@ -19,6 +18,7 @@ COMMENT= GPL Flash (TM) Library LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ jpeg.9:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 xext xkbfile xt WRKSRC= ${WRKDIR}/${DISTNAME}/lib USE_AUTOTOOLS= libtool:15 PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} @@ -26,8 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} USE_BZIP2= yes -USE_XLIB= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/swf.h diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile index 433306e65e3d..ec5502e06d77 100644 --- a/graphics/libgdgeda/Makefile +++ b/graphics/libgdgeda/Makefile @@ -21,7 +21,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile index d60b0b44ae3c..e7da0ffe0bb3 100644 --- a/graphics/libgfx/Makefile +++ b/graphics/libgfx/Makefile @@ -20,13 +20,13 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ jpeg.9:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS= ${LOCALBASE}/lib/libgzstream.a:${PORTSDIR}/devel/gzstream -USE_GL= yes +USE_GL= gl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-gzstream --with-libtiff-lzw --with-x -CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= libgfx.a diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile index 2ebf8d9bb399..a1dd3ad7c148 100644 --- a/graphics/libgltext/Makefile +++ b/graphics/libgltext/Makefile @@ -9,8 +9,7 @@ PORTNAME= libgltext PORTVERSION= 0.3.1 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gltext +MASTER_SITES= SF/gltext DISTNAME= gltext-${PORTVERSION} MAINTAINER= acm@FreeBSD.org @@ -19,11 +18,11 @@ COMMENT= Portable font rendering library for C++ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_AUTOTOOLS= libtool:15 -USE_GL= yes +USE_GL= glu USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +USE_LCONFIG= yes +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" @@ -32,7 +31,7 @@ OPTIONS= EXAMPLES "Compile examples, need libglut" off .include <bsd.port.pre.mk> .if defined(WITH_EXAMPLES) -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut FLAG_EXAMPLES= true PLIST_SUB+= EXAMPLES="" .else diff --git a/graphics/libglut/files/Makefile b/graphics/libglut/files/Makefile index 5274801265d0..e7f3ee5ffada 100644 --- a/graphics/libglut/files/Makefile +++ b/graphics/libglut/files/Makefile @@ -4,8 +4,8 @@ LIB= glut SHLIB_MAJOR= 4 -CFLAGS+= -I../../../include -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib -lGLU -lX11 -lXext -lGL -lXmu -lXi +CFLAGS+= -I../../../include -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lGLU -lX11 -lXext -lGL -lXmu -lXi LIBDIR= ${PREFIX}/lib NO_PROFILE?= yes diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 190ae5dce649..4ee4f0b578df 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -8,9 +8,9 @@ PORTNAME= libgnomecanvas PORTVERSION= 2.20.1.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 @@ -23,7 +23,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack gail diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index 2ed210104c4b..75e3a4d3765d 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -9,8 +9,7 @@ PORTNAME= libgnomecanvasmm PORTVERSION= 2.0.1 PORTREVISION= 7 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkmm +MASTER_SITES= SF/gtkmm DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org @@ -19,11 +18,10 @@ COMMENT= C++ wrapper for libgnomecanvas library LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack libgnomecanvas USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static post-patch: diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index 5a8659ba7296..36b5ba85d1d7 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomecanvasmm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,9 +23,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libgnomecanvasmm26 USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libgnomecanvas GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index c6cf27623a0c..9b40eeedc2e0 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -9,8 +9,7 @@ PORTNAME= libimg PORTVERSION= 1.2.4 PORTREVISION= 4 CATEGORIES?= graphics tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= tkimg +MASTER_SITES= SF/tkimg DISTNAME= img${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -54,7 +53,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/libz/*' \ MAKE_ARGS= PORTVERSION="${PORTVERSION}" LOCALBASE="${LOCALBASE}" \ MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" \ - X11BASE="${X11BASE}" SHLIB_NAME="${SHLIB_NAME}" \ + SHLIB_NAME="${SHLIB_NAME}" \ DIR="${DIR}" USE_LDCONFIG= yes diff --git a/graphics/libimg/files/Makefile.bsd b/graphics/libimg/files/Makefile.bsd index 54d2aa2df294..310b534be74c 100644 --- a/graphics/libimg/files/Makefile.bsd +++ b/graphics/libimg/files/Makefile.bsd @@ -2,7 +2,6 @@ SHLIB_NAME?= libimg.so.1 PORTVERSION?= 1.2.4 LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 TCL_VER?= 8.4 .if exists(${LOCALBASE}/lib/tk${TCL_VER}/tkConfig.sh) @@ -20,11 +19,11 @@ TK_STUB_LIB_SPEC= -L${LOCALBASE}/lib -ltkstub${TCL_VER:S/.//} LDADD= -lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \ ${TCL_STUB_LIB_SPEC} ${TK_STUB_LIB_SPEC} \ - -L${X11BASE}/lib -lX11 + -lX11 CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER}/generic -CFLAGS+= -D__X11__ -I${X11BASE}/include -DALLOW_B64 +CFLAGS+= -D__X11__ -I${LOCALBASE}/include -DALLOW_B64 CFLAGS+= -I${LOCALBASE}/include/tk${TCL_VER} CFLAGS+= -DNDEBUG -Wall -I. -DUSE_TCL_STUBS -DUSE_TK_STUBS CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include diff --git a/graphics/libimg/files/Makefile.tkstep80 b/graphics/libimg/files/Makefile.tkstep80 index a7bfdb7f30e8..7788c1607a4c 100644 --- a/graphics/libimg/files/Makefile.tkstep80 +++ b/graphics/libimg/files/Makefile.tkstep80 @@ -2,15 +2,14 @@ SHLIB_NAME?= libimg.so.1 PORTVERSION?= 1.2.4 LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 TCL_VER?= 8.0 LDADD= -lm -lz -L${LOCALBASE}/lib -lpng -ljpeg -ltiff \ - -L${X11BASE}/lib -lX11 + -lX11 CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER}/generic -CFLAGS+= -D__X11__ -I${X11BASE}/include -DALLOW_B64 +CFLAGS+= -D__X11__ -I${LOCALBASE}/include -DALLOW_B64 CFLAGS+= -I${LOCALBASE}/include/tkstep${TCL_VER} CFLAGS+= -DNDEBUG -Wall -I. CFLAGS+= -DVERSION=\"${PORTVERSION}\" -I${LOCALBASE}/include diff --git a/graphics/liblug/files/patch-aa b/graphics/liblug/files/patch-aa index 746a76bf7411..2d9ae6c2cb00 100644 --- a/graphics/liblug/files/patch-aa +++ b/graphics/liblug/files/patch-aa @@ -71,8 +71,8 @@ -VIEWINC = -I/usr/X11/include -VIEWLIB = -L/usr/X11/lib -lX11 -VIEWDEF = -DiX11 -DiLINUX -+VIEWINC = -I${X11BASE}/include -+VIEWLIB = -L${X11BASE}/lib -lX11 ++VIEWINC = -I${LOCALBASE}/include ++VIEWLIB = -L${LOCALBASE}/lib -lX11 +VIEWDEF = -DiX11 # diff --git a/graphics/libpcd/Makefile b/graphics/libpcd/Makefile index 102c7e0eabd2..6b9d648c7dc5 100644 --- a/graphics/libpcd/Makefile +++ b/graphics/libpcd/Makefile @@ -15,7 +15,7 @@ MAINTAINER= anray@FreeBSD.org COMMENT= A library for reading PhotoCD images USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} MAKEFILE= ${WRKSRC}/GNUmakefile diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index 60fbae9bdcb6..0cc8e7cf00d8 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -7,9 +7,9 @@ PORTNAME= librsvg PORTVERSION= 1.0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= SF MASTER_SITE_SUBDIR= sources/librsvg/1.0 MAINTAINER= gnome@FreeBSD.org @@ -21,7 +21,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomelibs gdkpixbuf USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 521e371c77e5..c06184d2e6f2 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -8,6 +8,7 @@ PORTNAME= librsvg2 PORTVERSION= 2.22.2 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,7 +25,6 @@ RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack diff --git a/graphics/libv3d/Makefile b/graphics/libv3d/Makefile index ada1e0dacc91..8edbc87d4803 100644 --- a/graphics/libv3d/Makefile +++ b/graphics/libv3d/Makefile @@ -81,7 +81,7 @@ MAN3= V3DGLInterpriteDelete.3 \ post-patch: @${REINPLACE_CMD} -e "s,make,${GMAKE},g" ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s,%%CFLAGS%%,${CFLAGS},g" \ - -e "s,%%X11BASE%%,${X11BASE},g" \ + -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ -e "s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g" \ -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g" \ ${WRKSRC}/libv3d/platforms.ini diff --git a/graphics/libv3d/files/patch-platforms.ini b/graphics/libv3d/files/patch-platforms.ini index f6bbe8ae16d3..52c466df385c 100644 --- a/graphics/libv3d/files/patch-platforms.ini +++ b/graphics/libv3d/files/patch-platforms.ini @@ -13,17 +13,17 @@ CPP = c++ PlatformSearchPathInclude = /usr/include/ - PlatformSearchPathInclude = /usr/X11R6/include/ -+ PlatformSearchPathInclude = %%X11BASE%%/include/ ++ PlatformSearchPathInclude = %%LOCALBASE%%/include/ PlatformSearchPathLib = /lib/ PlatformSearchPathLib = /usr/lib/ - PlatformSearchPathLib = /usr/X11R6/lib/ -+ PlatformSearchPathLib = %%X11BASE%%/lib/ ++ PlatformSearchPathLib = %%LOCALBASE%%/lib/ PlatformSearchPathEtc = /etc/ PlatformSearchPathEtc = /usr/etc/ PlatformSearchPathBin = /bin/ PlatformSearchPathBin = /usr/bin/ - PlatformSearchPathBin = /usr/X11R6/bin/ -+ PlatformSearchPathBin = %%X11BASE%%/bin/ ++ PlatformSearchPathBin = %%LOCALBASE%%/bin/ PlatformSearchPathBin = /usr/games/ PlatformSearchPathData = /usr/share/icons/ PlatformSearchPathData = /usr/share/games/ @@ -32,7 +32,7 @@ # FeatureCFLAGS = # FeatureLIBS = -lSM -lICE -lX11 -lXext -lXi -lXmu -# FeatureLIB_DIR = -L/usr/X11R6/lib/ -+# FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++# FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ # FeatureDepend = X11-lib # DependType = Library # MustExist = Yes @@ -42,9 +42,9 @@ MustExist = Yes - FeatureLIBS = -lGL -lGLU - FeatureLIB_DIR = -L/usr/X11R6/lib/ -+ FeatureCFLAGS = -I%%X11BASE%%/include %%PTHREAD_CFLAGS%% -fPIC ++ FeatureCFLAGS = -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%% -fPIC + FeatureLIBS = -lGL -lGLU %%PTHREAD_LIBS%% -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ ++ FeatureLIB_DIR = -L%%LOCALBASE%%/lib/ FeatureDepend = gl-lib DependType = Library MustExist = Yes diff --git a/graphics/libvisual-plugins/Makefile b/graphics/libvisual-plugins/Makefile index 9a4990081ad7..1649aa098ebb 100644 --- a/graphics/libvisual-plugins/Makefile +++ b/graphics/libvisual-plugins/Makefile @@ -7,10 +7,9 @@ PORTNAME= libvisual-plugins PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= libvisual +MASTER_SITES= SF/libvisual MAINTAINER= ports@FreeBSD.org COMMENT= Set of plugins for the libvisual framework @@ -19,12 +18,11 @@ LIB_DEPENDS= visual.0:${PORTSDIR}/graphics/libvisual WANT_GNOME= yes USE_GNOME= gnometarget pkgconfig -USE_GL= yes -USE_XLIB= yes +USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> @@ -32,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ BROKEN= Broken objformat handling .endif -BUILD_DEPENDS= mkdirhier:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake .if defined(WITH_MPLAYER) BUILD_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer diff --git a/graphics/libvisual04-plugins/Makefile b/graphics/libvisual04-plugins/Makefile index 46bc8325d700..b5ff89b1ce8d 100644 --- a/graphics/libvisual04-plugins/Makefile +++ b/graphics/libvisual04-plugins/Makefile @@ -30,8 +30,8 @@ CONFIGURE_ARGS= --disable-alsa \ --disable-gforce \ --disable-jess \ --prefix=${PREFIX} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" MAJORMINOR= ${PORTVERSION:C/.[0-9]+$//} diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile index 3b72c6ef0ea6..20e663aaf6d6 100644 --- a/graphics/libvisual04/Makefile +++ b/graphics/libvisual04/Makefile @@ -15,7 +15,6 @@ MAINTAINER= infofarmer@FreeBSD.org COMMENT= Abstraction library that sits between apps and visual plugin USE_AUTOTOOLS= libtool:15 -USE_XLIBS= yes USE_GNOME= gnomehack pkgconfig USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/libwpcg/Makefile b/graphics/libwpcg/Makefile index 7f8882b5cffa..409dfdeb968b 100644 --- a/graphics/libwpcg/Makefile +++ b/graphics/libwpcg/Makefile @@ -16,13 +16,12 @@ DISTNAME= libWPCG-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A basic 2D/3D computer graphics library which uses OpenGL -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_GCC= 3.4 +USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -lGL -lGLU -lglut" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lGL -lGLU -lglut" .include <bsd.port.pre.mk> diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile index a8f4171a755a..cb23c62df270 100644 --- a/graphics/libx3dtk/Makefile +++ b/graphics/libx3dtk/Makefile @@ -44,8 +44,8 @@ post-patch: do-configure: cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${QMAKE} \ -spec ${QMAKESPEC} \ - INCLUDEPATH=${X11BASE}/include \ - LIBS=-L${X11BASE}/lib \ + INCLUDEPATH=${LOCALBASE}/include \ + LIBS=-L${LOCALBASE}/lib \ PARSER=LIBXML \ LIBXML_DIR=${LOCALBASE} \ JPEG=YES \ @@ -57,8 +57,8 @@ do-configure: PREFIX="${PREFIX}" cd ${WRKSRC}/examples && ${SETENV} ${MAKE_ENV} ${QMAKE} \ -spec ${QMAKESPEC} \ - INCLUDEPATH=${X11BASE}/include \ - LIBS=-L${X11BASE}/lib \ + INCLUDEPATH=${LOCALBASE}/include \ + LIBS=-L${LOCALBASE}/lib \ PARSER=LIBXML \ LIBXML_DIR=${LOCALBASE} \ JPEG=YES \ diff --git a/graphics/linux-adobesvg/Makefile b/graphics/linux-adobesvg/Makefile index cab770fe0490..1d72fc5ee4f9 100644 --- a/graphics/linux-adobesvg/Makefile +++ b/graphics/linux-adobesvg/Makefile @@ -16,7 +16,7 @@ MAINTAINER= jylefort@FreeBSD.org COMMENT= The Adobe SVG browser plugin (Linux version) ONLY_FOR_ARCHS= i386 amd64 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes RESTRICTED= "Redistribution prohibited" diff --git a/graphics/linux-cairo/Makefile b/graphics/linux-cairo/Makefile index 0f26e0997f47..3b2712c4b3ad 100644 --- a/graphics/linux-cairo/Makefile +++ b/graphics/linux-cairo/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/l ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_XLIB= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-cairo/Makefile b/graphics/linux-f10-cairo/Makefile index 0f26e0997f47..3b2712c4b3ad 100644 --- a/graphics/linux-f10-cairo/Makefile +++ b/graphics/linux-f10-cairo/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/l ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_XLIB= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-gdk-pixbuf/Makefile b/graphics/linux-f10-gdk-pixbuf/Makefile index 430882b8953e..28ad286f678a 100644 --- a/graphics/linux-f10-gdk-pixbuf/Makefile +++ b/graphics/linux-f10-gdk-pixbuf/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux version of the graphic library for GTK+ USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} MD5_FILE?= ${PKGDIR}/distinfo diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile index 92cf2ae6a785..70552b4b75c1 100644 --- a/graphics/linux-f10-imlib/Makefile +++ b/graphics/linux-f10-imlib/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of imlib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile index 4f56ec81902b..abd359ef7b1a 100644 --- a/graphics/linux-f10-jpeg/Makefile +++ b/graphics/linux-f10-jpeg/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of the JPEG lib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 BRANDELF_DIRS= usr/bin diff --git a/graphics/linux-f10-libGLU/Makefile b/graphics/linux-f10-libGLU/Makefile index 1e246028c42f..0f0254055b1b 100644 --- a/graphics/linux-f10-libGLU/Makefile +++ b/graphics/linux-f10-libGLU/Makefile @@ -20,7 +20,7 @@ RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/graphics/linux-f10-libmng/Makefile b/graphics/linux-f10-libmng/Makefile index 39d256d648f2..6db7e51ba03c 100644 --- a/graphics/linux-f10-libmng/Makefile +++ b/graphics/linux-f10-libmng/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST?= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH} diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile index 7928ef433743..10c3d3261f22 100644 --- a/graphics/linux-f10-png/Makefile +++ b/graphics/linux-f10-png/Makefile @@ -18,7 +18,7 @@ COMMENT= RPM of the PNG lib ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= \ usr/lib/libpng.so.3 \ diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile index dfe6b021bc9f..d23671783b57 100644 --- a/graphics/linux-f10-png10/Makefile +++ b/graphics/linux-f10-png10/Makefile @@ -18,7 +18,7 @@ LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= usr/lib/libpng.so.2.${PORTVERSION} \ usr/lib/libpng.so.2 diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile index c2e5895ae1a4..307cb831be2c 100644 --- a/graphics/linux-f10-tiff/Makefile +++ b/graphics/linux-f10-tiff/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile index 2c0062549c48..33f945001b80 100644 --- a/graphics/linux-f10-ungif/Makefile +++ b/graphics/linux-f10-ungif/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-cairo/Makefile b/graphics/linux-f8-cairo/Makefile index 0f26e0997f47..3b2712c4b3ad 100644 --- a/graphics/linux-f8-cairo/Makefile +++ b/graphics/linux-f8-cairo/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1.0.4:${PORTSDIR}/x11-fonts/l ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_LINUX_RPM= yes USE_XLIB= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-gdk-pixbuf/Makefile b/graphics/linux-f8-gdk-pixbuf/Makefile index 430882b8953e..28ad286f678a 100644 --- a/graphics/linux-f8-gdk-pixbuf/Makefile +++ b/graphics/linux-f8-gdk-pixbuf/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux version of the graphic library for GTK+ USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} MD5_FILE?= ${PKGDIR}/distinfo diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile index 92cf2ae6a785..70552b4b75c1 100644 --- a/graphics/linux-f8-imlib/Makefile +++ b/graphics/linux-f8-imlib/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of imlib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile index 4f56ec81902b..abd359ef7b1a 100644 --- a/graphics/linux-f8-jpeg/Makefile +++ b/graphics/linux-f8-jpeg/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of the JPEG lib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 BRANDELF_DIRS= usr/bin diff --git a/graphics/linux-f8-libGLU/Makefile b/graphics/linux-f8-libGLU/Makefile index 1e246028c42f..0f0254055b1b 100644 --- a/graphics/linux-f8-libGLU/Makefile +++ b/graphics/linux-f8-libGLU/Makefile @@ -20,7 +20,7 @@ RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/graphics/linux-f8-libmng/Makefile b/graphics/linux-f8-libmng/Makefile index 39d256d648f2..6db7e51ba03c 100644 --- a/graphics/linux-f8-libmng/Makefile +++ b/graphics/linux-f8-libmng/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST?= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH} diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile index 7928ef433743..10c3d3261f22 100644 --- a/graphics/linux-f8-png/Makefile +++ b/graphics/linux-f8-png/Makefile @@ -18,7 +18,7 @@ COMMENT= RPM of the PNG lib ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= \ usr/lib/libpng.so.3 \ diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile index dfe6b021bc9f..d23671783b57 100644 --- a/graphics/linux-f8-png10/Makefile +++ b/graphics/linux-f8-png10/Makefile @@ -18,7 +18,7 @@ LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= usr/lib/libpng.so.2.${PORTVERSION} \ usr/lib/libpng.so.2 diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile index c2e5895ae1a4..307cb831be2c 100644 --- a/graphics/linux-f8-tiff/Makefile +++ b/graphics/linux-f8-tiff/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile index 2c0062549c48..33f945001b80 100644 --- a/graphics/linux-f8-ungif/Makefile +++ b/graphics/linux-f8-ungif/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile index 430882b8953e..28ad286f678a 100644 --- a/graphics/linux-gdk-pixbuf/Makefile +++ b/graphics/linux-gdk-pixbuf/Makefile @@ -16,7 +16,7 @@ COMMENT= Linux version of the graphic library for GTK+ USE_LINUX_RPM= yes LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} MD5_FILE?= ${PKGDIR}/distinfo diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile index 92cf2ae6a785..70552b4b75c1 100644 --- a/graphics/linux-imlib/Makefile +++ b/graphics/linux-imlib/Makefile @@ -16,7 +16,7 @@ COMMENT= RPM of imlib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile index 4f56ec81902b..abd359ef7b1a 100644 --- a/graphics/linux-jpeg/Makefile +++ b/graphics/linux-jpeg/Makefile @@ -15,7 +15,7 @@ COMMENT= RPM of the JPEG lib USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 BRANDELF_DIRS= usr/bin diff --git a/graphics/linux-libGLU/Makefile b/graphics/linux-libGLU/Makefile index 1e246028c42f..0f0254055b1b 100644 --- a/graphics/linux-libGLU/Makefile +++ b/graphics/linux-libGLU/Makefile @@ -20,7 +20,7 @@ RPMVERSION= 37.FC4.49.2.1 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes AUTOMATIC_PLIST=yes DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr diff --git a/graphics/linux-libmng/Makefile b/graphics/linux-libmng/Makefile index 39d256d648f2..6db7e51ba03c 100644 --- a/graphics/linux-libmng/Makefile +++ b/graphics/linux-libmng/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 PLIST?= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH} diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile index 7928ef433743..10c3d3261f22 100644 --- a/graphics/linux-png/Makefile +++ b/graphics/linux-png/Makefile @@ -18,7 +18,7 @@ COMMENT= RPM of the PNG lib ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= \ usr/lib/libpng.so.3 \ diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile index dfe6b021bc9f..d23671783b57 100644 --- a/graphics/linux-png10/Makefile +++ b/graphics/linux-png10/Makefile @@ -18,7 +18,7 @@ LATEST_LINK= linux-png10 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_FILES= usr/lib/libpng.so.2.${PORTVERSION} \ usr/lib/libpng.so.2 diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile index c2e5895ae1a4..307cb831be2c 100644 --- a/graphics/linux-tiff/Makefile +++ b/graphics/linux-tiff/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg ONLY_FOR_ARCHS= amd64 i386 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB+= PORTVERSION="${PORTVERSION}" diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile index 2c0062549c48..33f945001b80 100644 --- a/graphics/linux-ungif/Makefile +++ b/graphics/linux-ungif/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile index 3f396b95b50d..156879d1b40f 100644 --- a/graphics/makehuman/Makefile +++ b/graphics/makehuman/Makefile @@ -15,16 +15,15 @@ MAINTAINER= amdmi3@amdmi3.ru COMMENT= Application for parametrical modeling of 3D humanoid characters LIB_DEPENDS= animorph.0:${PORTSDIR}/graphics/animorph \ - mhgui.0:${PORTSDIR}/graphics/mhgui \ - glut.4:${PORTSDIR}/graphics/libglut + mhgui.0:${PORTSDIR}/graphics/mhgui GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig -USE_GL= yes +USE_GL= glut -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile index 647e38316b0f..6da92a59dbf0 100644 --- a/graphics/maverik/Makefile +++ b/graphics/maverik/Makefile @@ -23,7 +23,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ DISTNAME="${DISTNAME}" HAS_CONFIGURE= yes CONFIGURE_SCRIPT= setup -CONFIGURE_ARGS= --MESAPATH=${X11BASE} +CONFIGURE_ARGS= --MESAPATH=${LOCALBASE} USE_LDCONFIG= yes MANCOMPRESSED= no @@ -49,7 +49,7 @@ post-extract: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/genman3list.sh post-patch: - @${REINPLACE_CMD} -e "s,%%X11BASE%%,${X11BASE},g ; \ + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \ s,%%CC%%,${CC},g ; \ s,%%CXX%%,${CXX},g ; \ s,%%CFLAGS%%,${CFLAGS},g ; \ diff --git a/graphics/maverik/files/patch-setup b/graphics/maverik/files/patch-setup index 6bfe6c99a665..9d43054c290c 100644 --- a/graphics/maverik/files/patch-setup +++ b/graphics/maverik/files/patch-setup @@ -5,7 +5,7 @@ MESAPATH="" MESADEFAULT=1 -XLIBPATH="/usr/X11R6/lib" -+XLIBPATH="%%X11BASE%%/lib" ++XLIBPATH="%%LOCALBASE%%/lib" TR=0 TRINCL="" TRLIBS="" @@ -36,7 +36,7 @@ + CXXFLAG=`echo $OS $OT %%CXXFLAGS%%` if [ "$MESADEFAULT" = "1" ] ; then - MESAPATH="/usr/X11R6" -+ MESAPATH="%%X11BASE%%" ++ MESAPATH="%%LOCALBASE%%" fi OPENGLINCL="-I${MESAPATH}/include" OPENGLLIBS="-L${MESAPATH}/lib -lGL -lGLU -L${XLIBPATH} -lX11 -lXext" diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index 7f7f28f1d0cb..83fecf34cbc7 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -26,9 +26,9 @@ USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= # empty CONFIGURE_ARGS+= COMPILED_BY="ports@FreeBSD.org" -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CXXFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include .include <bsd.port.pre.mk> diff --git a/graphics/mesa-demos/files/config b/graphics/mesa-demos/files/config index 1b035a5dc8dd..a46afa0e1d7c 100644 --- a/graphics/mesa-demos/files/config +++ b/graphics/mesa-demos/files/config @@ -8,7 +8,7 @@ _CC := $(CC) _CXX := $(CXX) -_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \ +_CFLAGS := -fPIC -pedantic -I$(LOCALBASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \ -DPTHREADS $(PTHREAD_CFLAGS) _CXXFLAGS := -fPIC -pedantic $(CXXFLAGS) @@ -24,7 +24,7 @@ CXXFLAGS = $(_CXXFLAGS) GLUT_CFLAGS = -fexceptions -LIB_DIR = $(X11BASE)/lib +LIB_DIR = $(LOCALBASE)/lib APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm $(PTHREAD_LIBS) diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile index 2f88c00efe32..fe7618e5c536 100644 --- a/graphics/mhgui/Makefile +++ b/graphics/mhgui/Makefile @@ -24,8 +24,8 @@ USE_GNOME= pkgconfig USE_LDCONFIG= yes USE_GL= yes -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile index 814710b64374..c20ae34d9fd4 100644 --- a/graphics/morpheus/Makefile +++ b/graphics/morpheus/Makefile @@ -7,7 +7,7 @@ PORTNAME= morpheus PORTVERSION= 0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= http://www.winnicki.net/morpheus/meat/ @@ -15,10 +15,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A mesh (3D model) viewer for GNOME desktop LIB_DEPENDS= morph.0:${PORTSDIR}/graphics/libmorph \ - gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ - glut.4:${PORTSDIR}/graphics/libglut + gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea -USE_X_PREFIX= yes +USE_GL= glut USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/moth/Makefile b/graphics/moth/Makefile index 568582297218..39c91e220f30 100644 --- a/graphics/moth/Makefile +++ b/graphics/moth/Makefile @@ -20,11 +20,10 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff USE_GMAKE= yes USE_QT_VER= 3 -USE_GL= yes -USE_X_PREFIX= yes -MAKE_ARGS= CC="${CXX}" XLIBDIR="${X11BASE}/lib" MOC="${MOC}" \ +USE_GL= gl +MAKE_ARGS= CC="${CXX}" XLIBDIR="${LOCALBASE}/lib" MOC="${MOC}" \ CFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" QTDIR="${QT_PREFIX}" \ - GLINCLUDEDIR="${X11BASE}/include" \ + GLINCLUDEDIR="${LOCALBASE}/include" \ MOTH_INCLUDES="${WRKSRC_LIBMOTH}/include" \ MOTH_LIBRARIES="${WRKSRC_LIBMOTH}/lib" ALL_TARGET= clean moth diff --git a/graphics/mxp/Makefile b/graphics/mxp/Makefile index a5ca1d7b7e7f..8b5d3dbfe066 100644 --- a/graphics/mxp/Makefile +++ b/graphics/mxp/Makefile @@ -23,9 +23,8 @@ post-extract: @${CP} ${WRKSRC}/Makefile.noimake ${WRKSRC}/Makefile post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; \ - s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ + s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%CC%%|${CC}|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mxp ${PREFIX}/bin diff --git a/graphics/mxp/files/patch-Makefile b/graphics/mxp/files/patch-Makefile index 7aa5edbf6963..6660193704e4 100644 --- a/graphics/mxp/files/patch-Makefile +++ b/graphics/mxp/files/patch-Makefile @@ -17,8 +17,8 @@ # following 2 defines. -XLIBS = -L/usr/openwin/lib -XINC = -I/usr/openwin/include -+XLIBS = -L%%X11BASE%%/lib -+XINC = -I%%X11BASE%%/include ++XLIBS = -L%%LOCALBASE%%/lib ++XINC = -I%%LOCALBASE%%/include # Specify where your Xpm installation directories are # If you have the XPM libraries uncomment and adjust the following lines diff --git a/graphics/netpbm-devel/files/patch-pm_config.in.h b/graphics/netpbm-devel/files/patch-pm_config.in.h index 673f882f5496..21e6d984c5b4 100644 --- a/graphics/netpbm-devel/files/patch-pm_config.in.h +++ b/graphics/netpbm-devel/files/patch-pm_config.in.h @@ -20,7 +20,7 @@ -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" +#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt" +#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt" -+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGB_DB3 "%%LOCALBASE%%/lib/X11/rgb.txt" #endif /* CONFIGURE: This is the name of an environment variable that tells diff --git a/graphics/netpbm/files/patch-pm_config.in.h b/graphics/netpbm/files/patch-pm_config.in.h index 673f882f5496..21e6d984c5b4 100644 --- a/graphics/netpbm/files/patch-pm_config.in.h +++ b/graphics/netpbm/files/patch-pm_config.in.h @@ -20,7 +20,7 @@ -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" +#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt" +#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt" -+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGB_DB3 "%%LOCALBASE%%/lib/X11/rgb.txt" #endif /* CONFIGURE: This is the name of an environment variable that tells diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index e5bed1fbd218..7b60a841a357 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -31,14 +31,14 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ tiff.4:${PORTSDIR}/graphics/tiff USE_GHOSTSCRIPT= yes -USE_XPM= yes +USE_XORG= xpm USE_FREETYPE= yes HAS_CONFIGURE= yes CONFIGURE_ENV= \ - CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS= --includedir=${LOCALBASE}/include --includedir=${X11BASE}/include + CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_ARGS= --includedir=${LOCALBASE}/include USE_GMAKE= yes PKGDEINSTALL= ${PKGINSTALL} diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile index 3a6baf404025..b46ae2a427cb 100644 --- a/graphics/ocaml-lablgl/Makefile +++ b/graphics/ocaml-lablgl/Makefile @@ -15,9 +15,7 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= stas@FreeBSD.org COMMENT= OpenGL interface for Objective Caml -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - -USE_GL= yes +USE_GL= glut USE_GMAKE= yes USE_OCAML= yes USE_OCAML_WASH= yes @@ -35,7 +33,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/lablgl post-extract: @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config - @${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" \ + @${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE},g" \ -e "s,/usr/local,${LOCALBASE},g" \ -e "s,^\(BINDIR[ \t]*=\).*,\1${PREFIX}/bin,g" \ -e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \ diff --git a/graphics/oglext/Makefile b/graphics/oglext/Makefile index ad00f09ff043..3c0d0bd91934 100644 --- a/graphics/oglext/Makefile +++ b/graphics/oglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= oglext PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= http://www.julius.caesar.de/files/oglext/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,8 +18,7 @@ COMMENT= A library for easier access to OpenGL extensions BUILD_DEPENDS= ${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl USE_LDCONFIG= yes REINPLACE_ARGS= -i "" diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile index 899c4096d7a8..e72a9a8d1082 100644 --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= zzip.13:${PORTSDIR}/devel/zziplib \ WRKSRC= ${WRKDIR}/ogrenew CONFIGURE_ARGS= --disable-cg --program-transform-name= --enable-static \ --with-cppunit-prefix=/nonexistent --disable-freeimage -CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -DNDEBUG" \ +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -DNDEBUG" \ ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \ ZZIPLIB_LIBS="-L${LOCALBASE}/lib -lzzip" GNU_CONFIGURE= YES @@ -41,7 +41,7 @@ post-patch: s|sdl-config|${SDL_CONFIG}|g; \ s|-lpthread|${PTHREAD_LIBS}|g; \ s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \ - s|-lGL -lGLU|-L${X11BASE}/lib &|g; \ + s|-lGL -lGLU|-L${LOCALBASE}/lib &|g; \ s|" == "x|" = "x|g; \ s|-lfreeimage|-L${LOCALBASE}/lib &|g' \ ${WRKSRC}/configure diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 9e8c609f72ea..e4c0e94041a0 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -8,10 +8,9 @@ PORTNAME= opencv PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= opencvlibrary +MASTER_SITES= SF/opencvlibrary MAINTAINER= msabramo@yahoo.com COMMENT= Open Source Computer Vision Library from Intel @@ -56,7 +55,6 @@ OPTIONS= GTK "Enable GTK+-2.0 support" Off \ .include <bsd.port.pre.mk> .if defined(WITH_GTK) -USE_XLIB= yes USE_GNOME= gtk20 CONFIGURE_ARGS+=--with-gtk .else @@ -86,9 +84,9 @@ CONFIGURE_ARGS+=--without-gtk #.endif .if defined(WITH_XINE) -CFLAGS+= -I${X11BASE}/include -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+=--with-xine .else diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index 0908883e8ef3..2daa7b619852 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -21,9 +21,8 @@ LIB_DEPENDS= Magick.10:${PORTSDIR}/graphics/ImageMagick \ cdf.0:${PORTSDIR}/science/cdf USE_BISON= build -USE_GL= yes +USE_GL= gl USE_MOTIF= yes -USE_XLIB= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CFLAGS+= ${PTHREAD_CFLAGS} @@ -84,7 +83,7 @@ pre-configure: ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g" .endfor ${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g" \ - -e "s;/usr/X11R6;${X11BASE};g" \ + -e "s;/usr/X11R6;${LOCALBASE};g" \ ${WRKSRC}/configure post-install: diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile index 8127e33ed5f1..634d50c6655f 100644 --- a/graphics/openrm/Makefile +++ b/graphics/openrm/Makefile @@ -7,10 +7,9 @@ PORTNAME= openrm PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-devel-${PORTVERSION}-1 .ifdef (WITH_DEMOS) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -28,8 +27,7 @@ WRKSRC2= ${WRKDIR}/rmdemo EXTRA_PATCHES= ${PATCHDIR}/makeinclude.diff .endif -USE_X_PREFIX= yes -USE_GL= yes +USE_GL= glu USE_PERL5_BUILD=yes ALL_TARGET= freebsd docs MAKE_ARGS= AR=${AR} \ @@ -38,8 +36,7 @@ MAKE_ARGS= AR=${AR} \ ECHO_CMD=${ECHO_CMD} \ LN=${LN} \ RM=${RM} \ - STRIP_CMD=${STRIP_CMD} \ - X11BASE=${X11BASE} + STRIP_CMD=${STRIP_CMD} USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 @@ -57,7 +54,6 @@ pre-everything:: .ifdef (WITH_DEMOS) post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC2}/makeinclude .endif diff --git a/graphics/openrm/files/makeinclude.diff b/graphics/openrm/files/makeinclude.diff index 1ba5236b68e0..0c1219a908bc 100644 --- a/graphics/openrm/files/makeinclude.diff +++ b/graphics/openrm/files/makeinclude.diff @@ -14,14 +14,14 @@ -OPENGLHOME=/usr -OPENGLLIBS=-L/usr/lib -lGL -lGLU -OPENGLCFLAGS=-I/usr/include -+OPENGLHOME=%%X11BASE%% ++OPENGLHOME=%%LOCALBASE%% +OPENGLLIBS=-L${OPENGLHOME}/lib -lGL -lGLU +OPENGLCFLAGS=-I${OPENGLHOME}/include # -X11HOME=/usr/X11R6 -X11LIBS=-L/usr/X11R6/lib -lXmu -lX11 -lpthread -lm -X11CFLAGS=-I/usr/X11R6/include -+X11HOME=%%X11BASE%% ++X11HOME=%%LOCALBASE%% +X11LIBS=-L${X11HOME}/lib -lXmu -lX11 %%PTHREAD_LIBS%% -lm +X11CFLAGS=-I${X11HOME}/include # diff --git a/graphics/osg-devel/bsd.osg.mk b/graphics/osg-devel/bsd.osg.mk index 7ced6bfea0ea..aa07f82c1c62 100644 --- a/graphics/osg-devel/bsd.osg.mk +++ b/graphics/osg-devel/bsd.osg.mk @@ -27,7 +27,7 @@ post-patch: osg-post-patch osg-post-patch: @${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \ s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \ - s|(-I\|-L\|-rpath )/usr/X11R6|\1${X11BASE}|' \ + s|(-I\|-L\|-rpath )/usr/X11R6|\1${LOCALBASE}|' \ ${WRKSRC}/Make/makedefs @${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \ ${WRKSRC}/Make/makerules diff --git a/graphics/osg/bsd.osg.mk b/graphics/osg/bsd.osg.mk index 7ced6bfea0ea..aa07f82c1c62 100644 --- a/graphics/osg/bsd.osg.mk +++ b/graphics/osg/bsd.osg.mk @@ -27,7 +27,7 @@ post-patch: osg-post-patch osg-post-patch: @${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \ s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \ - s|(-I\|-L\|-rpath )/usr/X11R6|\1${X11BASE}|' \ + s|(-I\|-L\|-rpath )/usr/X11R6|\1${LOCALBASE}|' \ ${WRKSRC}/Make/makedefs @${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \ ${WRKSRC}/Make/makerules diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile index 1eefb574e3b4..bc2a6fb773f9 100644 --- a/graphics/p5-Cairo/Makefile +++ b/graphics/p5-Cairo/Makefile @@ -10,8 +10,7 @@ PORTNAME= Cairo PORTVERSION= 1.053 PORTREVISION= 1 CATEGORIES= graphics perl5 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtk2-perl +MASTER_SITES= SF/gtk2-perl PKGNAMEPREFIX= p5- MAINTAINER= ahze@FreeBSD.org diff --git a/graphics/p5-Chart-Graph/Makefile b/graphics/p5-Chart-Graph/Makefile index c0bb1945aca8..5954c6e37413 100644 --- a/graphics/p5-Chart-Graph/Makefile +++ b/graphics/p5-Chart-Graph/Makefile @@ -29,6 +29,6 @@ MAN3= Chart::Graph.3 \ Chart::Graph::Xrt3d.3 post-patch: - @${REINPLACE_CMD} -e "s,%%X11BASE%%,${X11BASE}," ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/graphics/p5-Chart-Graph/files/patch-Makefile.PL b/graphics/p5-Chart-Graph/files/patch-Makefile.PL index c2ddf94ff870..b9dfda99cf44 100644 --- a/graphics/p5-Chart-Graph/files/patch-Makefile.PL +++ b/graphics/p5-Chart-Graph/files/patch-Makefile.PL @@ -19,7 +19,7 @@ if (not defined $xvfb and ($_ eq "xrt2d" or $_ eq "xrt3d" or $_ eq "xmgrace")) { print "Enter path to X virtual frame buffer(Xvfb): "; - $xvfb = <STDIN>; -+ $xvfb = "%%X11BASE%%/bin/Xvfb"; ++ $xvfb = "%%LOCALBASE%%/bin/Xvfb"; chop $xvfb; @xvfb = $xvfb; } diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile index cfcf61379a7f..a4c715267977 100644 --- a/graphics/p5-GD/Makefile +++ b/graphics/p5-GD/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd PERL_CONFIGURE= yes CONFIGURE_ARGS= -options "JPEG,FT,XPM,GIF,PNG" \ - -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} \ - -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE} + -lib_gd_path ${LOCALBASE} -lib_ft_path} \ + -lib_png_path ${LOCALBASE} -lib_zlib_path MAN1= bdf2gdfont.pl.1 MAN3= GD.3 GD::Polyline.3 GD::Simple.3 \ diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile index 390e5b4675d4..762c222570c7 100644 --- a/graphics/p5-Imlib2/Makefile +++ b/graphics/p5-Imlib2/Makefile @@ -23,6 +23,6 @@ PERL_CONFIGURE= yes MAN3= Imlib2.3 post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/graphics/p5-OpenGL/Makefile b/graphics/p5-OpenGL/Makefile index 5738a36ba587..44d7e58afa46 100644 --- a/graphics/p5-OpenGL/Makefile +++ b/graphics/p5-OpenGL/Makefile @@ -17,11 +17,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@FreeBSD.org COMMENT= Perl module to display 3D data using OpenGL, GLU, GLUT, and GLX -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - +USE_XORG= glut PERL_CONFIGURE= yes post-patch: - @${PERL} -pi -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/Makefile.PL + @${PERL} -pi -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/Makefile.PL .include <bsd.port.mk> diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile index 12a8f6e3b3b7..d3c93fbe5578 100644 --- a/graphics/paintlib/Makefile +++ b/graphics/paintlib/Makefile @@ -23,8 +23,8 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-SDL --disable-dfb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= paintlib-config.1 diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile index 6b3f7c0419b6..8ed51dc5e2af 100644 --- a/graphics/pgplot/Makefile +++ b/graphics/pgplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgplot PORTVERSION= 5.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/ DISTNAME= ${PORTNAME}${PORTVERSION:R} @@ -17,15 +17,14 @@ COMMENT= A C/FORTRAN library for drawing graphs on a variety of display devices LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes USE_PERL5_BUILD=yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} .include <bsd.port.pre.mk> +USE_XORG= x11 xproto xt USE_FORTRAN= yes -MAKE_ARGS+= X11BASE="${X11BASE}" post-install: .for f in libcpgplot.so libpgplot.so diff --git a/graphics/pgplot/files/Makefile b/graphics/pgplot/files/Makefile index 90f6b4358de3..e1abc0b5ffea 100644 --- a/graphics/pgplot/files/Makefile +++ b/graphics/pgplot/files/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ all: - make -f Makefile.flib X11BASE="${X11BASE}" + make -f Makefile.flib LOCALBASE="${LOCALBASE}" make -f Makefile.clib - make -f Makefile.bin X11BASE="${X11BASE}" + make -f Makefile.bin LOCALBASE="${LOCALBASE}" make -f Makefile.doc install: diff --git a/graphics/pgplot/files/Makefile.bin b/graphics/pgplot/files/Makefile.bin index e2ccc80b3986..0e668c9828ab 100644 --- a/graphics/pgplot/files/Makefile.bin +++ b/graphics/pgplot/files/Makefile.bin @@ -1,6 +1,6 @@ DRVDIR=./drivers -LIBS=-L${X11BASE}/lib -lX11 -lm -XINCL=-I${X11BASE}/include +LIBS=-L${LOCALBASE}/lib -lX11 -lm +XINCL=-I${LOCALBASE}/include CFLAGS+= $(XINCL) -DPGDISP .PATH: . ./pgdispd diff --git a/graphics/pgplot/files/Makefile.demo b/graphics/pgplot/files/Makefile.demo index 080127040544..2d2ff02104a1 100644 --- a/graphics/pgplot/files/Makefile.demo +++ b/graphics/pgplot/files/Makefile.demo @@ -1,6 +1,6 @@ PGPLOT_LIB = -L/usr/local/lib -lpgplot CPGPLOT_LIB = -L/usr/local/lib -lcpgplot -LIBS= -L${X11BASE}/lib -lX11 -lm +LIBS= -L${LOCALBASE}/lib -lX11 -lm OSVERSION!= /sbin/sysctl -n kern.osreldate .if ${OSVERSION} > 400004 diff --git a/graphics/pgplot/files/Makefile.flib b/graphics/pgplot/files/Makefile.flib index f1f653772045..24ce5f8bf0d1 100644 --- a/graphics/pgplot/files/Makefile.flib +++ b/graphics/pgplot/files/Makefile.flib @@ -15,7 +15,7 @@ DRIVERS=gidriv.f gldriv.f hgdriv.f lxdriv.f nudriv.f ppdriv.f psdriv.f ttdriv.f SRCS= ${PG_ROUTINES} ${PG_NON_STANDARD} ${GR_ROUTINES} ${SYSTEM_ROUTINES} \ ${DRIVERS} grexec.f -CFLAGS+=-DPG_PPU -I${X11BASE}/include -I${PREFIX}/include +CFLAGS+=-DPG_PPU -I${LOCALBASE}/include -I${PREFIX}/include LDADD=-L${PREFIX}/lib -lpng .include <bsd.lib.mk> diff --git a/graphics/php4-ffmpeg/Makefile b/graphics/php4-ffmpeg/Makefile index f21ef098d4ce..84a21f422d45 100644 --- a/graphics/php4-ffmpeg/Makefile +++ b/graphics/php4-ffmpeg/Makefile @@ -27,6 +27,6 @@ USE_PHPIZE= yes USE_PHPEXT= yes IGNORE_WITH_PHP?=5 DEFAULT_PHP_VER?=4 -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> diff --git a/graphics/picturebook/files/patch-aa b/graphics/picturebook/files/patch-aa index a9ef7cee4946..63d0df30a258 100644 --- a/graphics/picturebook/files/patch-aa +++ b/graphics/picturebook/files/patch-aa @@ -3,7 +3,7 @@ @@ -1,5 +1,9 @@ -CFLAGS = -DWITH_DISPLAY=1 -Wall -O2 -g -I/usr/X11R6/include -I/usr/local/include -SRC = mchip.c capture.c dump.c sonypi.c pci.c yuv.c timer.c avi.c command.c display.c ptable.c jpeg.c -+CFLAGS += -DWITH_DISPLAY=1 -I${X11BASE}/include -I${LOCALBASE}/include ++CFLAGS += -DWITH_DISPLAY=1 -I${LOCALBASE}/include +SRCMI = mchip.c capture.c dump.c sonypi.c yuv.c timer.c avi.c command.c display.c ptable.c jpeg.c +#LINUX +#SRCMD = pci.c diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 9db582337bf5..6b7776b895c0 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= pixmap PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications/pixmap @@ -17,11 +17,13 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= A pixmap editor based on XPM library # requires rgb.txt -BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} +BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb \ + showrgb:${PORTSDIR}/x11/rgb + WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm xbitmaps x11 xaw xmu xt sm ice xext MAN1= pixmap.1 CFLAGS+= -D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 386f59dc79a6..e04bfc2e9ef6 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -25,6 +25,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -54,9 +55,9 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif CONFIGURE_TARGET= --target=${MACHINE_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" \ +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ + CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ + CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \ --disable-optimiz diff --git a/graphics/povray31/files/patch-ab b/graphics/povray31/files/patch-ab index ca37fbe6a7bd..1acc44a9241f 100644 --- a/graphics/povray31/files/patch-ab +++ b/graphics/povray31/files/patch-ab @@ -24,7 +24,7 @@ #X11 = /usr/lpp/X11 -X11 = /usr/X11R6 -+X11 = $(X11BASE) ++X11 = $(LOCALBASE) # You probably won't need to change these if you have the X11 variable # above set properly... diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index 386f59dc79a6..e04bfc2e9ef6 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -25,6 +25,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -54,9 +55,9 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif CONFIGURE_TARGET= --target=${MACHINE_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" \ +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ + CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ + CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \ --disable-optimiz diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 386f59dc79a6..e04bfc2e9ef6 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ @@ -25,6 +25,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg +USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -54,9 +55,9 @@ CXXFLAGS= -O3 -tpp7 -axN -Vaxlib .endif CONFIGURE_TARGET= --target=${MACHINE_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" \ +CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \ + CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \ + CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \ --disable-optimiz diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 19db0b98c472..d2778ea47a8c 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -29,8 +29,8 @@ USE_LDCONFIG= yes MAN1= pstoedit.1 CPPFLAGS= -I${LOCALBASE}/include/ming -I${LOCALBASE}/include \ - -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile index a0f7806fc658..bc10450b13ec 100644 --- a/graphics/pvmpov/Makefile +++ b/graphics/pvmpov/Makefile @@ -41,7 +41,7 @@ pre-configure: ${TAR} -c -f - povray31 ) \ | (cd ${WRKSRC} && ${TAR} --unlink -x -f -) @ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch - @ ${PERL} -pi -e "s|%X11BASE%|${X11BASE}| ; s|%LOCALBASE%|${LOCALBASE}|" \ + @ ${PERL} -pi -e "s|%LOCALBASE%|${LOCALBASE}|" \ ${BUILDBASE}/Makefile.aimk do-build: diff --git a/graphics/pvmpov/files/patch-ab b/graphics/pvmpov/files/patch-ab index f74cb40a1d82..bc9572eda285 100644 --- a/graphics/pvmpov/files/patch-ab +++ b/graphics/pvmpov/files/patch-ab @@ -30,7 +30,7 @@ #X11 = /usr/lpp/X11 -X11 = /usr/X11R6 -+X11 = %X11BASE% ++X11 = %LOCALBASE% # You probably won't need to change these if you have the X11 variable # above set properly... diff --git a/graphics/py-amanith/files/patch-setup.py b/graphics/py-amanith/files/patch-setup.py index 2aaca0ef825e..5d3ee2be7615 100644 --- a/graphics/py-amanith/files/patch-setup.py +++ b/graphics/py-amanith/files/patch-setup.py @@ -5,21 +5,21 @@ from os.path import join +LOCALBASE = os.environ['LOCALBASE'] -+X11BASE = os.environ['X11BASE'] ++LOCALBASE = os.environ['LOCALBASE'] + try: amanith_base = os.environ["AMANITHDIR"] except: - amanith_base = "amanith" + amanith_base = os.environ['LOCALBASE'] -+ X11BASE = os.environ['X11BASE'] ++ LOCALBASE = os.environ['LOCALBASE'] debug = False libs = ["amanith"] -inc = [join("changes", "include"), join(amanith_base, "include"), "include"] -lib = [join(amanith_base, "lib")] -+inc = [join("changes", "include"), join(amanith_base, "include"), join(X11BASE,"include") ,"include"] -+lib = [join(amanith_base, "lib"), join(X11BASE, "lib")] ++inc = [join("changes", "include"), join(amanith_base, "include"), join(LOCALBASE,"include") ,"include"] ++lib = [join(amanith_base, "lib"), join(LOCALBASE, "lib")] cc_args = [] swig_args = ["-Ibuild/amanith"] diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 4cd1bbabe2d2..5e81ec4f5191 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -26,8 +26,8 @@ USE_GMAKE= yes USE_GNOME= gnometarget gnomehack GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pygtk -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \ diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile index 5b8b31439abe..625942df3b62 100644 --- a/graphics/py-cgkit/Makefile +++ b/graphics/py-cgkit/Makefile @@ -85,7 +85,7 @@ pre-configure: @${ECHO} "INSTALL_CGKIT_LIGHT = True" >> ${WRKSRC}/config.cfg; .endif @${REINPLACE_CMD} -e "/%%LOCALBASE%%/s//${LOCALBASE:S/\//\\\//g}/g" \ - -e "/%%X11BASE%%/s//${X11BASE:S/\//\\\//g}/g" ${WRKSRC}/supportlib/cpp_config.cfg ${WRKSRC}/config.cfg; \ + ${WRKSRC}/supportlib/cpp_config.cfg ${WRKSRC}/config.cfg; \ cd ${WRKSRC}/supportlib; \ scons diff --git a/graphics/py-cgkit/files/config.cfg b/graphics/py-cgkit/files/config.cfg index 83f5ed047e2f..4334cfaad918 100644 --- a/graphics/py-cgkit/files/config.cfg +++ b/graphics/py-cgkit/files/config.cfg @@ -1,6 +1,6 @@ ## $FreeBSD$ -INC_DIRS += ["%%LOCALBASE%%/include", "%%X11BASE%%/include"] -LIB_DIRS += ["%%LOCALBASE%%/lib", "%%X11BASE%%/lib"] +INC_DIRS += ["%%LOCALBASE%%/include"] +LIB_DIRS += ["%%LOCALBASE%%/lib"] #LIB3DS_AVAILABLE = True #LIB3DS_PATH = r"%%LOCALBASE%%/lib" #LIB3DS_LIBNAME = "3ds" diff --git a/graphics/py-cgkit/files/cpp_config.cfg b/graphics/py-cgkit/files/cpp_config.cfg index 3a4bc80ef989..b09c826aaf89 100644 --- a/graphics/py-cgkit/files/cpp_config.cfg +++ b/graphics/py-cgkit/files/cpp_config.cfg @@ -1,3 +1,3 @@ # $FreeBSD$ -CPPPATH+=["%%LOCALBASE%%/include", "%%X11BASE%%/include"] +CPPPATH+=["%%LOCALBASE%%/include"] diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index 935af4b294ac..21df87a771dd 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -30,7 +30,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ - -e 's,/usr/X11R6,${X11BASE},g' \ + -e 's,/usr/X11R6,${LOCALBASE},g' \ -e 's,/usr/include/X11,${LOCALBASE}/include,g' \ ${WRKSRC}/${PYSETUP} .if defined(WITHOUT_X11) diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile index 411edb985c4f..be890c654daa 100644 --- a/graphics/py-glewpy/Makefile +++ b/graphics/py-glewpy/Makefile @@ -24,8 +24,8 @@ BROKEN= fails to install USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" .include <bsd.port.mk> diff --git a/graphics/py-imaging/files/patch-setup.py b/graphics/py-imaging/files/patch-setup.py index 154e5762ae04..6748982172b1 100644 --- a/graphics/py-imaging/files/patch-setup.py +++ b/graphics/py-imaging/files/patch-setup.py @@ -11,7 +11,7 @@ + add_directory(include_dirs, + os.path.join(os.getenv("PREFIX"), "include")) + add_directory(include_dirs, -+ os.path.join(os.getenv("X11BASE"), "include")) ++ os.path.join(os.getenv("LOCALBASE"), "include")) # # locate tkinter libraries diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index 12dcde35f6af..0aa862665e3c 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -44,7 +44,6 @@ post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc\.h>|<stdlib.h>|g' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/config/freebsd.cfg ${WRKSRC}/Tkinter.py @${FIND} ${WRKSRC} -name "*.bak" -delete diff --git a/graphics/py-opengl/files/patch-config::freebsd.cfg b/graphics/py-opengl/files/patch-config::freebsd.cfg index 3618ad54abf9..86ba38a0bd7f 100644 --- a/graphics/py-opengl/files/patch-config::freebsd.cfg +++ b/graphics/py-opengl/files/patch-config::freebsd.cfg @@ -6,8 +6,8 @@ gl_platform=GLX
-include_dirs=/usr/include:/usr/local/include:/usr/X11/include:/usr/X11R6/include
-library_dirs=/usr/lib:/usr/local/lib:/usr/X11/lib:/usr/X11R6/lib
-+include_dirs=/usr/include:%%LOCALBASE%%/include:%%X11BASE%%/include
-+library_dirs=/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib
++include_dirs=/usr/include:%%LOCALBASE%%/include
++library_dirs=/usr/lib:%%LOCALBASE%%/lib
; a os.pathsep separated list of the libs needed when linking GL
[GL]
diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index b65bead19c56..9ea3f91ef951 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -33,7 +33,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-edit USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes -USE_GL= yes +USE_GL= gl USE_GMAKE= yes PYDISTUTILS_PKGNAME= Soya @@ -55,7 +55,7 @@ CFLAGS += -fPIC post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/setup.py + -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile index 5ac2525d744a..67e9c2f09382 100644 --- a/graphics/pyro/Makefile +++ b/graphics/pyro/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyro PORTVERSION= 1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://nostatic.org/pyro/ EXTRACT_SUFX= .tgz @@ -15,11 +15,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A simple OpenGL-based firework simulator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= gl glut +USE_XORG= xi xmu xext EXAMPLES= pyro.dsp water.jpg PLIST_FILES= bin/pyro ${EXAMPLES:S|^|%%EXAMPLESDIR%%/|} @@ -31,9 +30,8 @@ post-patch: do-build: ${CC} ${CFLAGS} ${WRKSRC}/*.c -o ${WRKSRC}/${PORTNAME} \ - -DAUXDIR=\"${EXAMPLESDIR}\" -I${WRKSRC} -I${X11BASE}/include \ - -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib \ - -ljpeg -lm -lXmu -lXi -lXext -lGL -lGLU -lglut + -DAUXDIR=\"${EXAMPLESDIR}\" -I${WRKSRC} -I${LOCALBASE}/include \ + -L${LOCALBASE}/lib -ljpeg -lm -lXmu -lXi -lXext -lGL -lGLU -lglut do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 0ca1f834ba4b..50daaaf0f822 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -29,6 +29,10 @@ PLIST_FILES= bin/qiv .include <bsd.port.pre.mk> +.if defined(WITH_XINERAMA) +USE_XORG+= x11 xinerama +.enif + pre-configure: .if ! defined(WITH_XINERAMA) .else diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile index 1a41e7574595..73bd97a1dfab 100644 --- a/graphics/qslim/Makefile +++ b/graphics/qslim/Makefile @@ -17,20 +17,20 @@ COMMENT= SlimKit Surface Modeling Tools LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - forms.1:${PORTSDIR}/x11-toolkits/xforms \ - glut.4:${PORTSDIR}/graphics/libglut + forms.1:${PORTSDIR}/x11-toolkits/xforms CONFIGURE_WRKSRC= ${WRKSRC}/mixkit/build BUILD_WRKSRC= ${WRKSRC}/mixkit/src USE_GMAKE= yes GNU_CONFIGURE= yes +USE_GL= glut CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= # none -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \ - -I${X11BASE}/include/X11 ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/X11 ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CFLAGS+= -DMIX_ANSI_IOSTREAMS -fpermissive diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile index 4348856c6975..8cfdfe8407b4 100644 --- a/graphics/quat-gui/Makefile +++ b/graphics/quat-gui/Makefile @@ -7,7 +7,7 @@ PORTNAME= quat PORTVERSION= 1.20 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.physcip.uni-stuttgart.de/phy11733/download/ PKGNAMESUFFIX= -gui @@ -16,12 +16,13 @@ DISTNAME= quat-${PORTVERSION:S/.p/pre/} MAINTAINER= dyeske@gmail.com COMMENT= A Three-dimensional fractal creator (X11 GUI) -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +USE_XORG= xext +USE_GL= gl glut GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -L${X11BASE}/lib" \ - LIBS="-lXext -lGL" FLUID="${X11BASE}/bin/fluid}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ + LIBS="-lXext -lGL" FLUID="${LOCALBASE}/bin/fluid" .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index 91c1600c47eb..e168751270af 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -7,10 +7,9 @@ PORTNAME= quesa PORTVERSION= 1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF .ifdef (WITH_EXAMPLES) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}examples-${PORTVERSION}${EXTRACT_SUFX} @@ -21,8 +20,8 @@ COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM) USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_GL= yes -USE_X_PREFIX= yes +USE_GL= glu +USE_XORG= x11 ice .ifdef (WITH_EXAMPLES) USE_GNOME= gtk12 .endif diff --git a/graphics/renderpark/Makefile b/graphics/renderpark/Makefile index b6ce9f4dc3dd..0cbbc5bab440 100644 --- a/graphics/renderpark/Makefile +++ b/graphics/renderpark/Makefile @@ -7,7 +7,7 @@ PORTNAME= renderpark PORTVERSION= 3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/ DISTNAME= RenderPark @@ -19,7 +19,7 @@ DIST_SUBDIR= ${DISTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= System for physically based photo-realistic image synthesis -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut .ifdef (WITH_XRML) LIB_DEPENDS+= xrml.0:${PORTSDIR}/graphics/xrml @@ -29,7 +29,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC2= ${WRKDIR}/Scenes USE_GMAKE= yes -USE_X_PREFIX= yes USE_MOTIF= yes USE_GCC= 2.95 NOT_FOR_ARCHS= amd64 sparc64 ia64 @@ -62,9 +61,9 @@ post-patch: @${ECHO_CMD} "" >> ${WRKSRC}/Config.site @${ECHO_CMD} "####################################################" >> ${WRKSRC}/Config.site @${ECHO_CMD} "# VRML input support (requires XRML library)" >> ${WRKSRC}/Config.site - @${ECHO_CMD} "VRMLHOME = ${X11BASE}" >> ${WRKSRC}/Config.site - @${ECHO_CMD} "VRMLFLAGS = -I${X11BASE}/include/xrml" >> ${WRKSRC}/Config.site - @${ECHO_CMD} "VRMLLIB = -L${X11BASE}/lib -lxrml" >> ${WRKSRC}/Config.site + @${ECHO_CMD} "VRMLHOME = ${LOCALBASE}" >> ${WRKSRC}/Config.site + @${ECHO_CMD} "VRMLFLAGS = -I${LOCALBASE}/include/xrml" >> ${WRKSRC}/Config.site + @${ECHO_CMD} "VRMLLIB = -L${LOCALBASE}/lib -lxrml" >> ${WRKSRC}/Config.site .endif @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CXX%%|${CXX}|g ;\ diff --git a/graphics/renderpark/files/patch-Config.site b/graphics/renderpark/files/patch-Config.site index cf66f972298c..494081fbdb3f 100644 --- a/graphics/renderpark/files/patch-Config.site +++ b/graphics/renderpark/files/patch-Config.site @@ -20,18 +20,18 @@ # Mesa (free OpenGL-like library) -MESAHOME = /usr/local -+MESAHOME = ${X11BASE} ++MESAHOME = ${LOCALBASE} DRIVERFLAGS = -I$(MESAHOME)/include DRIVERLIBS = -L$(MESAHOME)/lib -lGLU -lGL ################################################################ -X11HOME = /usr/X11R6 -+X11HOME = ${X11BASE} ++X11HOME = ${LOCALBASE} XINCLUDES = -I$(X11HOME)/include XLIBS = -L$(X11HOME)/lib -lXt -lXmu -lXext -lX11 -MOTIFHOME = /usr/local -+MOTIFHOME = ${X11BASE} ++MOTIFHOME = ${LOCALBASE} MOTIFINCLUDES = -I$(MOTIFHOME)/include # -lXpm library necessary for Motif >=2.0, not for Motif <2.0 MOTIFLIBS = -L$(MOTIFHOME)/lib -lXm -lXpm diff --git a/graphics/robot/Makefile b/graphics/robot/Makefile index 23f67ffb838a..5715e483519f 100644 --- a/graphics/robot/Makefile +++ b/graphics/robot/Makefile @@ -7,7 +7,7 @@ PORTNAME= robot PORTVERSION= 4.93.89 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= ftp://lheaftp.gsfc.nasa.gov/pub/corbet/robot/ DISTNAME= robot-beta @@ -16,12 +16,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Graph plotting and data analysis program using OpenLook BUILD_DEPENDS= fsplit:${PORTSDIR}/devel/fortran-utils \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview -USE_X_PREFIX= yes USE_GMAKE= yes -MAKE_ENV+= OPENWINHOME=${X11BASE} +MAKE_ENV+= OPENWINHOME=${LOCALBASE} WEB_BROWSER?= firefox USE_FORTRAN= yes FFLAGS+= -ffixed-line-length-80 diff --git a/graphics/robot/files/patch-Robot+Makefile b/graphics/robot/files/patch-Robot+Makefile index 7a06af59c709..6213ac6719d4 100644 --- a/graphics/robot/files/patch-Robot+Makefile +++ b/graphics/robot/files/patch-Robot+Makefile @@ -45,7 +45,7 @@ #X library - may need to edit if location different -XLIB = -L/usr/X11R6/lib -lX11 -+XLIB = -L${X11BASE}/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 # location of the FITS library FITSDIR = ../Fitsio/ diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index bb80c9fbcef3..b21535f861a7 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -18,13 +18,12 @@ DIST_SUBDIR= ruby MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL/GLU/GLUT interface modules for Ruby -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut - USE_RUBY= yes USE_RUBY_EXTCONF= yes +USE_GL= glut WRKSRC= ${WRKDIR}/${PORTNAME} -CONFIGURE_ARGS= --with-ruby-dir="${LOCALBASE}" --with-x11-dir="${X11BASE}" +CONFIGURE_ARGS= --with-ruby-dir="${LOCALBASE}" --with-x11-dir="${LOCALBASE}" INSTALL_TARGET= site-install post-install: diff --git a/graphics/ruby-pgplot/Makefile b/graphics/ruby-pgplot/Makefile index adc09502b3fe..56f6e9b8db26 100644 --- a/graphics/ruby-pgplot/Makefile +++ b/graphics/ruby-pgplot/Makefile @@ -26,7 +26,7 @@ USE_FORTRAN= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes -CONFIGURE_ARGS= --with-x11-dir="${X11BASE}" --with-gfortranlib="gfortran -L`${CAT} ${WRKSRC}/LIBDIR`/../../.." +CONFIGURE_ARGS= --with-x11-dir="${LOCALBASE}" --with-gfortranlib="gfortran -L`${CAT} ${WRKSRC}/LIBDIR`/../../.." INSTALL_TARGET= site-install DOCS_EN= FuncUsage README.en diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile index b57f624a65e0..1edf3c26cfa1 100644 --- a/graphics/ruby-rmagick/Makefile +++ b/graphics/ruby-rmagick/Makefile @@ -24,8 +24,8 @@ USE_RUBY_SETUP= yes RUBY_SETUP= setup.rb CONFIGURE_ENV= CFLAGS="${CFLAGS}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -I${X11BASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ RUBY="${RUBY}" CONFIGURE_ARGS= --doc-dir="${RUBY_MODDOCDIR}" --prefix="${PREFIX}" .if defined(NOPORTDOCS) diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile index 4759a4002a86..3611bc6ff5fc 100644 --- a/graphics/ruby-tgif/Makefile +++ b/graphics/ruby-tgif/Makefile @@ -7,7 +7,7 @@ PORTNAME= tgif PORTVERSION= 20010408 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics ruby MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Ruby extension library to draw Tgif graphics BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build \ - imake:${X_IMAKE_PORT} + imake:${PORTSDIR}/devel/imake # NB not USE_IMAKE; this is required for the tgif build but this # port doesn't use it directly. @@ -26,12 +26,11 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build \ USE_GETTEXT= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes -USE_XLIB= yes TGIF_PORT= graphics/tgif WRKSRC= ${WRKDIR}/ruby-${PORTNAME}-${PORTVERSION} -CONFIGURE_ARGS= --with-x-dir="${X11BASE}" \ +CONFIGURE_ARGS= --with-x-dir="${LOCALBASE}" \ --with-ldflags=" `cd ${WRKSRC}/tgif; ${MAKE} -V LDOPTIONS -V LOCAL_LIBRARIES -V LDLIBS -V EXTRA_LOAD_FLAGS | paste -s -`" INSTALL_TARGET= site-install diff --git a/graphics/s3switch/Makefile b/graphics/s3switch/Makefile index af0586d04d71..2782bebff6ee 100644 --- a/graphics/s3switch/Makefile +++ b/graphics/s3switch/Makefile @@ -7,7 +7,7 @@ PORTNAME= s3switch PORTVERSION= 0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.probo.com/timr/ DISTNAME= s3ssrc @@ -17,7 +17,6 @@ COMMENT= Enable TV-out on S3 graphics cards USE_ZIP= yes USE_GMAKE= yes -USE_X_PREFIX= yes NO_WRKSUBDIR= yes MAKE_ENV+= FREEBSD=1 diff --git a/graphics/sage/Makefile b/graphics/sage/Makefile index e6ec83082a4a..999ab50f2092 100644 --- a/graphics/sage/Makefile +++ b/graphics/sage/Makefile @@ -24,7 +24,7 @@ USE_SDL= sdl MAN3= sage.3 sage_init.3 -CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${X11BASE}/include" +CONFIGURE_ENV= "CFLAGS=${CFLAGS} -I${LOCALBASE}/include" post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/configure diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile index 78dfcf3d0ea0..702a9885b003 100644 --- a/graphics/sced/Makefile +++ b/graphics/sced/Makefile @@ -7,7 +7,7 @@ PORTNAME= sced PORTVERSION= 1.03 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.cs.wisc.edu/~schenney/sced/src/ @@ -16,7 +16,7 @@ COMMENT= SCene EDitor for povray/renderman/genray/etc RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray -USE_XLIB= yes +USE_XORG= x11 xt xaw GNU_CONFIGURE= yes MAN1= sced.1 diff --git a/graphics/scwm-icons/Makefile b/graphics/scwm-icons/Makefile index 220be44f1b63..32d8c87bc890 100644 --- a/graphics/scwm-icons/Makefile +++ b/graphics/scwm-icons/Makefile @@ -7,16 +7,13 @@ PORTNAME= scwm-icons PORTVERSION= 0.99.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= scwm +MASTER_SITES= SF/scwm MAINTAINER= ports@FreeBSD.org COMMENT= An icon collection for the scwm window manager -USE_X_PREFIX= yes - NO_BUILD= yes do-install: diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 0033a752de90..4493575c3da1 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -23,8 +23,8 @@ USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lm" CONFIGURE_ARGS= --enable-tif --enable-xcf USE_LDCONFIG= yes diff --git a/graphics/show/files/Makefile b/graphics/show/files/Makefile index 26a5c982aa32..635fe654c248 100644 --- a/graphics/show/files/Makefile +++ b/graphics/show/files/Makefile @@ -2,7 +2,7 @@ CC ?= gcc CFLAGS ?= -g -O2 -Wall -XROOT = ${X11BASE} +XROOT = ${LOCALBASE} LROOT = ${LOCALBASE} INCLUDES = -I$(XROOT)/include -I$(LROOT)/include LIBS = -lX11 -lXext -ljpeg -lpng -ltiff -lz -lungif -lm -lImlib diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile index 54bd58bb6c64..e5faa50493d6 100644 --- a/graphics/showimg/Makefile +++ b/graphics/showimg/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_KDEBASE_VER= 3 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-pgsql OPTIONS= KIPI "Support for libkipi" on \ diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 63cc95710516..09852141c813 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -7,7 +7,7 @@ PORTNAME= simage PORTVERSION= 1.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.coin3d.org/pub/coin/src/ @@ -20,7 +20,6 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 3d104e24888d..4eecbbe89a53 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -28,7 +28,7 @@ PYDISTUTILS_NOEGGINFO= yes USE_XORG= x11 xext -CONFFLAGS= --tk-autoconf --tk-flags="-I${X11BASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${X11BASE}/lib -lX11" +CONFFLAGS= --tk-autoconf --tk-flags="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -L${LOCALBASE}/lib -ltk84 -ltcl84 -L${LOCALBASE}/lib -lX11" SKETCHDOCS= BUGS Doc NEWS PROJECTS README TODO SKETCHSCRIPTS= finishinst.py sk2ppm.py sk2ps.py skconvert.py skencil.py \ diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile index 1283f9c376a6..3c03be664214 100644 --- a/graphics/sng/Makefile +++ b/graphics/sng/Makefile @@ -10,20 +10,19 @@ PORTNAME= sng PORTVERSION= 1.0.2 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Compiler/decompiler for Scriptable Network Graphics -BUILD_DEPENDS= ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb -RUN_DEPENDS= ${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb +BUILD_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb +RUN_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-png-inc=${LOCALBASE}/include \ - --with-rgbtxt=${X11BASE}/lib/X11/rgb.txt + --with-rgbtxt=${LOCALBASE}/lib/X11/rgb.txt MAN1= sng.1 PLIST_FILES= bin/sng bin/sng_regress diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index df5965fcbfb7..622c7460651d 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -7,10 +7,9 @@ PORTNAME= sodipodi PORTVERSION= 0.34 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= A small vector based drawing program with GNOME libraries @@ -18,7 +17,6 @@ COMMENT= A small vector based drawing program with GNOME libraries LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 diff --git a/graphics/tcm/files/patch-Config.tmpl b/graphics/tcm/files/patch-Config.tmpl index 9832ddf48927..0a5c8697754c 100644 --- a/graphics/tcm/files/patch-Config.tmpl +++ b/graphics/tcm/files/patch-Config.tmpl @@ -15,7 +15,7 @@ YACC = bison -XWIN_HOME = /usr/X11R6 -+XWIN_HOME = $(X11BASE) ++XWIN_HOME = $(LOCALBASE) SYSFLAGS = -DBSD # SYSFLAGS += -DDEBUG diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile index 9810fd8c5565..c3ced679aa22 100644 --- a/graphics/tkpng/Makefile +++ b/graphics/tkpng/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ --with-tclinclude=${LOCALBASE}/include/tcl${TK_VER}/generic \ --with-tkinclude=${LOCALBASE}/include/tk${TK_VER}/generic \ --exec-prefix=${PREFIX} --enable-shared -CPPFLAGS= -I${LOCALBASE}/include/tk${TK_VER}/generic -I${X11BASE}/include +CPPFLAGS= -I${LOCALBASE}/include/tk${TK_VER}/generic -I${LOCALBASE}/include CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" TKPKG= ${PORTNAME}${PORTVERSION} PLIST_SUB= VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER} diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile index b188b92da539..546e08a6ac6b 100644 --- a/graphics/truevision/Makefile +++ b/graphics/truevision/Makefile @@ -10,8 +10,7 @@ PORTNAME= truevision PORTVERSION= 0.5.5.2 PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= ports@FreeBSD.org @@ -24,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui -USE_GL= yes +USE_GL= gl USE_PYTHON= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -32,9 +31,9 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= truevision.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \ +CPPFLAGS= -I${LOCALBASE}/include \ `pkg-config --cflags gtkglext-1.0` -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib \ +LDFLAGS= -L${LOCALBASE}/lib \ `pkg-config --libs gtkglext-1.0` post-patch: diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 2f33e9f195b8..68949be2a695 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" GLDIR="${X11BASE}" +CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" GLDIR="${LOCALBASE}" CONFIGURE_ARGS= --with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib @@ -39,7 +39,7 @@ USE_LDCONFIG= yes CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include \ -I${QT_PREFIX}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS} -LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib \ +LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib \ -ljpeg -L${QT_PREFIX}/lib -lcompat ${PTHREAD_LIBS} .include <bsd.port.pre.mk> diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index cb4c6f9c2a1c..9604663d4b9a 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= ufraw PORTVERSION= 0.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= SF @@ -22,7 +22,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ GCONF_SCHEMAS= ${PORTNAME}.schemas GNU_CONFIGURE= yes -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gtk20 glib20 gnomehack intltool intlhack libartlgpl2 pkgconfig diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config::urt index 262d91126a6b..bde1fb8ace6e 100644 --- a/graphics/urt/files/patch-config::urt +++ b/graphics/urt/files/patch-config::urt @@ -158,6 +158,6 @@ #ifdef X11 -LIBX11 = -lX11 -INCX11 = -+LIBX11 = -L${X11BASE}/lib -lX11 -+INCX11 = -I${X11BASE}/include ++LIBX11 = -L${LOCALBASE}/lib -lX11 ++INCX11 = -I${LOCALBASE}/include #endif diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile index 7ecf14960c81..85c2536d3a31 100644 --- a/graphics/vcg/Makefile +++ b/graphics/vcg/Makefile @@ -7,7 +7,7 @@ PORTNAME= vcg PORTVERSION= 1.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/ DISTNAME= ${PORTNAME}.20050204 @@ -16,9 +16,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A Visualization Tool for compiler graphs -BUILD_DEPENDS= imake:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -USE_X_PREFIX= yes +USE_XORG= x11 xext MANL= pbmrot90.l pbmshift.l pbm2hp.l vcgdemomaker.l vcg.l xvcg.l WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} @@ -29,8 +29,8 @@ pre-patch: @${SED} -e "s:%%CC%%:${CC}:g" \ -e "s:%%CFLAGS%%:${CFLAGS}:g" \ -e "s:%%MAKE%%:${MAKE}:g;" \ + -e "s:%%LOCALBASE%%:${LOCALBASE}:g" \ -e "s:%%PREFIX%%:${PREFIX}:g" \ - -e "s:%%X11BASE%%:${X11BASE}:g" \ -e "s:%%INSTALL_PROGRAM%%:${INSTALL_PROGRAM}:g" \ -e "s:%%INSTALL_MAN%%:${INSTALL_MAN}:g" \ < ${FILESDIR}/${file} > ${WRKSRC}/preconf/X11ccFreeBSD/${file} diff --git a/graphics/vcg/files/conf b/graphics/vcg/files/conf index 0f697b21356d..bc96e8cd6ffb 100644 --- a/graphics/vcg/files/conf +++ b/graphics/vcg/files/conf @@ -1,5 +1,5 @@ -ADDINCLUDEPATHNAME|-I%%X11BASE%%/include/ -ADDLIBPATHNAME|-L%%X11BASE/lib/ +ADDINCLUDEPATHNAME|-I%%LOCALBASE%%/include/ +ADDLIBPATHNAME|-L%%LOCALBASE%%/lib/ ADDLIBSNAME|-lXext -lX11 -lm ALIGNMENTNAME|8 ANSINAME|#undef ANSI_C diff --git a/graphics/vcg/files/tMakefile b/graphics/vcg/files/tMakefile index aa43268f6a84..7241f008ea78 100644 --- a/graphics/vcg/files/tMakefile +++ b/graphics/vcg/files/tMakefile @@ -104,7 +104,7 @@ CLINKFLAGS = -o # then please use # INCLUDES = -I/usr/local/X11/include/ # INCLUDES = -I/RW/esprit/X11R5/include/ -INCLUDES = -I%%X11BASE%%/include/ +INCLUDES = -I%%LOCALBASE%%/include/ # Library directories # For Sunview, this should be enough, because on Suns, Sunview @@ -117,7 +117,7 @@ INCLUDES = -I%%X11BASE%%/include/ # then please use # LIBPATH = -L/usr/local/X11/lib/ # LIBPATH = -L/RW/esprit/X11R5/lib/ -LIBPATH = -L%%X11BASE%%/lib/ +LIBPATH = -L%%LOCALBASE%%/lib/ # Libraries # Libraries for SunView diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile index d10caa42ed23..e5296f7c1156 100644 --- a/graphics/vertex/Makefile +++ b/graphics/vertex/Makefile @@ -41,10 +41,9 @@ post-patch: s|%%CXX%%|${CXX}|g ; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/platforms.ini + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/vertex/platforms.ini @${REINPLACE_CMD} -e \ - 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/vertex/vmahelp.c + 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/vertex/vmahelp.c @${REINPLACE_CMD} -e \ 's|CC =|CC ?=|g' ${WRKSRC}/pconf/Makefile diff --git a/graphics/vertex/files/patch-platforms.ini b/graphics/vertex/files/patch-platforms.ini index 647c154d41dd..3548d3f93801 100644 --- a/graphics/vertex/files/patch-platforms.ini +++ b/graphics/vertex/files/patch-platforms.ini @@ -1,6 +1,6 @@ ---- vertex/platforms.ini.orig Mon Nov 1 00:35:03 2004 -+++ vertex/platforms.ini Thu Oct 5 17:14:40 2006 -@@ -22,23 +22,26 @@ +--- ./vertex/platforms.ini.orig 2004-11-01 07:35:03.000000000 +0100 ++++ ./vertex/platforms.ini 2008-04-14 10:22:58.000000000 +0200 +@@ -22,23 +22,23 @@ Platform = UNIX Description = For most any UNIX system @@ -18,23 +18,20 @@ PlatformSearchPathInclude = /usr/include/ - PlatformSearchPathInclude = /usr/X11R6/include/ + PlatformSearchPathInclude = %%LOCALBASE%%/include/ -+ PlatformSearchPathInclude = %%X11BASE%%/include/ PlatformSearchPathLib = /lib/ PlatformSearchPathLib = /usr/lib/ - PlatformSearchPathLib = /usr/X11R6/lib/ + PlatformSearchPathLib = %%LOCALBASE%%/lib/ -+ PlatformSearchPathLib = %%X11BASE%%/lib/ PlatformSearchPathEtc = /etc/ PlatformSearchPathEtc = /usr/etc/ PlatformSearchPathBin = /bin/ PlatformSearchPathBin = /usr/bin/ - PlatformSearchPathBin = /usr/X11R6/bin/ + PlatformSearchPathBin = %%LOCALBASE%%/bin/ -+ PlatformSearchPathBin = %%X11BASE%%/bin/ PlatformSearchPathData = /usr/share/icons/ PlatformFeature = debug Description = Just adds -g to the CFLAGS for debugging -@@ -51,7 +54,7 @@ +@@ -51,7 +51,7 @@ # Newer versions of Imlib only need to link to -lImlib # FeatureLIBS = -lImlib -lpng -ltiff -ljpeg -lz FeatureLIBS = -lImlib @@ -43,15 +40,7 @@ FeatureDepend = Imlib-lib DependType = Library MustExist = Yes -@@ -66,6 +69,7 @@ - Description = An implementation of OpenGL (ie Mesa3D) - MustExist = Yes - FeatureLIBS = -lGL -lGLU -+ FeatureLIB_DIR = -L%%X11BASE%%/lib/ - FeatureDepend = gl-lib - DependType = Library - MustExist = Yes -@@ -83,11 +87,11 @@ +@@ -83,11 +83,11 @@ MustExist = Yes FeatureCFLAGS = `gtk-config --cflags` FeatureLIBS = `gtk-config --libs` @@ -65,7 +54,7 @@ DependGrepString = gtk_init FeatureDepend = gtk-devel DependType = Program -@@ -98,7 +102,7 @@ +@@ -98,7 +98,7 @@ MustExist = Yes FeatureCFLAGS = FeatureLIBS = -lgtkgl diff --git a/graphics/vertex/files/patch-vmahelp.c b/graphics/vertex/files/patch-vmahelp.c index 63dc6bb58d03..550e43dc4152 100644 --- a/graphics/vertex/files/patch-vmahelp.c +++ b/graphics/vertex/files/patch-vmahelp.c @@ -15,12 +15,12 @@ $FreeBSD$ - "/usr/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/usr/local/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/netscape", "", (char *)HELP_PROG_INPUT_TYPE_URL, \ \ - "/usr/X11R6/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ - "/usr/X11R6/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ -+ "%%X11BASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/nxterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ ++ "%%LOCALBASE%%/bin/xterm", "-e lynx", (char *)HELP_PROG_INPUT_TYPE_URL, \ \ NULL, NULL, NULL \ } diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile index ab10753e4417..b750c11b5017 100644 --- a/graphics/view3ds/Makefile +++ b/graphics/view3ds/Makefile @@ -7,7 +7,7 @@ PORTNAME= view3ds PORTVERSION= 1.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -19,13 +19,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= A simple realtime 3DS file previewer based on the Lib3ds Library -LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds \ - glut.4:${PORTSDIR}/graphics/libglut +LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= bin/view3ds -USE_X_PREFIX= yes +USE_GL= glut USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/visionegg/Makefile b/graphics/visionegg/Makefile index 386224459108..233e8f19a3f2 100644 --- a/graphics/visionegg/Makefile +++ b/graphics/visionegg/Makefile @@ -10,8 +10,7 @@ PORTNAME= visionegg PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Visual stimulus creation and control @@ -31,8 +30,8 @@ LIB_DEPENDS= \ USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_BUILDARGS= -L${X11BASE}/lib -CFLAGS+= -I${X11BASE}/include +PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include do-build: @(cd ${BUILD_WRKSRC}; \ diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile index 03c39623f97e..b3a65307cd91 100644 --- a/graphics/vp/Makefile +++ b/graphics/vp/Makefile @@ -16,8 +16,7 @@ COMMENT= An image viewer for X USE_SDL= image GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= vp.1 diff --git a/graphics/vvv/Makefile b/graphics/vvv/Makefile index 285c59d67d25..28bc58227b61 100644 --- a/graphics/vvv/Makefile +++ b/graphics/vvv/Makefile @@ -7,7 +7,7 @@ PORTNAME= vvv PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.inf.ufes.br/~thomas/graphics/vvv/ \ ${MASTER_SITE_LOCAL} @@ -18,13 +18,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A tutorial tool for understanding viewing and projection in OpenGL -BUILD_DEPENDS= ${X11BASE}/lib/libglui.a:${PORTSDIR}/devel/glui -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +BUILD_DEPENDS= ${LOCALBASE}/lib/libglui.a:${PORTSDIR}/devel/glui USE_GMAKE= yes -USE_GL= yes -USE_X_PREFIX= yes -MAKE_ENV= OS=unix X11BASE="${X11BASE}" +USE_GL= glut +MAKE_ENV= OS=unix ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/vvv/files/patch-Makefile b/graphics/vvv/files/patch-Makefile index 3de8d1fc3b8e..0525663dd6d1 100644 --- a/graphics/vvv/files/patch-Makefile +++ b/graphics/vvv/files/patch-Makefile @@ -5,8 +5,8 @@ ifeq ($(OS),unix)
RM = rm
- LFLAG1 = -L/usr/lib -L/usr/X11R6/lib
-+ IFLAG1 = -I$(X11BASE)/include -+ LFLAG1 = -L$(X11BASE)/lib
++ IFLAG1 = -I$(LOCALBASE)/include ++ LFLAG1 = -L$(LOCALBASE)/lib
# Where the GLUI library is:
- LFLAG2 = -L/home/thomas/graphics/OpenGL/glui_v2_2/lib
+ LFLAG2 =
diff --git a/graphics/wildmagic/Makefile b/graphics/wildmagic/Makefile index 31ac830c8df5..1e778bf48675 100644 --- a/graphics/wildmagic/Makefile +++ b/graphics/wildmagic/Makefile @@ -16,7 +16,7 @@ COMMENT= The Wild Magic Real-Time 3D Graphics Engine USE_ZIP= yes USE_DOS2UNIX= yes -USE_GL= yes +USE_GL= gl glut USE_GMAKE= yes USE_LDCONFIG= yes @@ -26,8 +26,8 @@ MAKEFILE= makefile.wm${MV} ALL_TARGET= build MAKE_ARGS= CFG=${CONFIG} SYS=${OPSYS:L} GRF=${GRF} MAKE_ENV= CC=${CXX} GCC=${CXX} AR=${AR} EGL=${EGL} EGL0=glx EGL1=Glx \ - INCPATH="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBPATH="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ + INCPATH="-I${LOCALBASE}/include" \ + LIBPATH="-L${LOCALBASE}/lib" \ XLIBS="-lX11 -lXext" GLIBS="-lGL -lGLU" PLIST_SUB= CFG=${CONFIG} GRF=${GRF} WM=Wm${MV} diff --git a/graphics/wmgrabimage/files/patch-aa b/graphics/wmgrabimage/files/patch-aa index 07fac39b9703..e81879496f1d 100644 --- a/graphics/wmgrabimage/files/patch-aa +++ b/graphics/wmgrabimage/files/patch-aa @@ -6,9 +6,9 @@ -INCDIR = -I/usr/X11R6/include/X11 -DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+INCDIR = -I${X11BASE}/include ++INCDIR = -I${LOCALBASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib # for linux LIBS = -lXpm -lX11 -lXext # for Solaris diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index 7addcaf57d96..79f64c36e40a 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -7,10 +7,9 @@ PORTNAME= xaos PORTVERSION= 3.2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xaos +MASTER_SITES= SF/xaos DISTNAME= XaoS-${PORTVERSION} MAINTAINER= makc@issp.ac.ru @@ -18,7 +17,7 @@ COMMENT= A real-time fractal browser for X11 and ASCII terminals LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_XLIB= yes +USE_XORG= x11 xt USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile index ec997cbf795f..be0e24f5d905 100644 --- a/graphics/xaralx/Makefile +++ b/graphics/xaralx/Makefile @@ -7,7 +7,7 @@ PORTNAME= XaraLX PORTVERSION?= 0.7r1692 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= graphics MASTER_SITES= http://downloads.xara.com/opensource/ \ ${MASTER_SITE_LOCAL} @@ -18,7 +18,6 @@ MAINTAINER= vd@FreeBSD.org COMMENT?= Top-tier vector/general purpose graphics program (recommended version) USE_BZIP2= yes -USE_X_PREFIX= yes BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config \ xml2-config:${PORTSDIR}/textproc/libxml2 \ @@ -34,6 +33,7 @@ CONFIGURE_ARGS+= --program-suffix=${PKGNAMESUFFIX} USE_GMAKE= yes MAKE_ENV?= LANG=C +USE_XORG= x11 USE_GCC= 3.4+ USE_WX= 2.6 WX_CONF_ARGS= absolute diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index 28d2a4614dc2..9cc2e4afdbd5 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -17,7 +17,7 @@ MAINTAINER= tg@FreeBSD.org COMMENT= View complete directories of X bitmaps and X pixmaps USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xbmbrowser.1 USE_GMAKE= yes diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile index 6b1bf95105c9..3428a7928a70 100644 --- a/graphics/xd3d/Makefile +++ b/graphics/xd3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= xd3d PORTVERSION= 8.3.1 +PORTREVISION= 1 CATEGORIES= graphics math MASTER_SITES= http://www.cmap.polytechnique.fr/~jouve/xd3d/ @@ -36,11 +37,11 @@ RUN_DEPENDS+= gifsicle:${PORTSDIR}/graphics/gifsicle MASTER_SITES_BACKUP= http://pompo.net/ports/ -USE_XLIB= yes REINPLACE_ARGS= -i "" FETCH_CMD= /usr/bin/fetch FETCH_BEFORE_ARGS= -R -o ${DISTDIR}/${DISTFILES} +USE_XORG= x11 xpm USE_FORTRAN= yes FFLAGS+= -O MEMORY_XD3D?= 64 @@ -67,7 +68,7 @@ post-patch: @${CP} ${WRKSRC}/RULES.freeBSD ${WRKSRC}/RULES @${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \ -e "s|%%PREFIX%%|${PREFIX}|" \ - -e "s|%%X11BASE%%|${X11BASE}|" \ + -e "s|%%X11BASE%%|${LOCALBASE}|" \ -e "s|%%LANG%%|${XD3D_LANG}|" \ -e "s|%%MEMORY_XD3D%%|${MEMORY_XD3D}|" \ -e "s|%%F77%%|${F77}|" \ diff --git a/graphics/xdgagrab/Makefile b/graphics/xdgagrab/Makefile index 90e324d8f0e1..5f6685c72878 100644 --- a/graphics/xdgagrab/Makefile +++ b/graphics/xdgagrab/Makefile @@ -7,16 +7,16 @@ PORTNAME= xdgagrab PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/ MAINTAINER= ports@FreeBSD.org COMMENT= Capture an X server screen with a mouse pointer +USE_XORG= x11 xxf86dga ALL_TARGET= xdgagrab PLIST_FILES= bin/xdgagrab -USE_X_PREFIX= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xdgagrab ${PREFIX}/bin diff --git a/graphics/xdgagrab/files/patch-aa b/graphics/xdgagrab/files/patch-aa index 3b5bc5bf3814..2a526a21f859 100644 --- a/graphics/xdgagrab/files/patch-aa +++ b/graphics/xdgagrab/files/patch-aa @@ -5,5 +5,5 @@ xdgagrab : xdgagrab.c - gcc -O2 -m486 -Wall -I/usr/X11R6/include -o xdgagrab xdgagrab.c -L/usr/X11R6/lib -lX11 -lXxf86dga -lXext -+ ${CC} ${CFLAGS} -I${X11BASE}/include -o xdgagrab xdgagrab.c -L${X11BASE}/lib -lX11 -lXxf86dga -lXext ++ ${CC} ${CFLAGS} -I${LOCALBASE}/include -o xdgagrab xdgagrab.c -L${LOCALBASE}/lib -lX11 -lXxf86dga -lXext diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile index 8fae02168303..279b6b721ace 100644 --- a/graphics/xdl/Makefile +++ b/graphics/xdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdl PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= trevor MAINTAINER= ports@FreeBSD.org COMMENT= Display DL animations on an X screen -USE_X_PREFIX= yes +USE_XORG= x11 MAN1= xdl.1 PLIST_FILES= bin/xdl diff --git a/graphics/xdl/files/patch-ab b/graphics/xdl/files/patch-ab index f2f6a40f2216..116544faf4b4 100644 --- a/graphics/xdl/files/patch-ab +++ b/graphics/xdl/files/patch-ab @@ -8,8 +8,8 @@ -CFLAGS = -O2 -LIBS = -lX11 $(IXLIBS) +CC ?= gcc -+CFLAGS += -I${X11BASE}/include -+LIBS += -L${X11BASE}/lib -lX11 $(IXLIBS) ++CFLAGS += -I${LOCALBASE}/include ++LIBS += -L${LOCALBASE}/lib -lX11 $(IXLIBS) # # These specify where to install the binary diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile index 202c44699c1e..af11149aedc2 100644 --- a/graphics/xfig-devel/Makefile +++ b/graphics/xfig-devel/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION:S,.a,-alpha,} LATEST_LINK= xfig-devel USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xfig.1 MAKE_ENV+= DOCSDIR=${DOCSDIR} diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 89215c6f139a..f6076aec1213 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -25,7 +25,7 @@ CONFLICTS= xfig-[12].* xfig-3.1* xfig-3.2.[1234]* WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xfig.1 MANCOMPRESSED= yes diff --git a/graphics/xfig/files/patch-Imakefile b/graphics/xfig/files/patch-Imakefile index ac0d2078f502..4ec69eaa05e0 100644 --- a/graphics/xfig/files/patch-Imakefile +++ b/graphics/xfig/files/patch-Imakefile @@ -8,7 +8,7 @@ +BINDIR = $(PREFIX)/bin XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p -MKDIRHIER = mkdirhier -+MKDIRHIER = ${X11BASE}/bin/mkdirhier ++MKDIRHIER = ${LOCALBASE}/bin/mkdirhier XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the XCOMM app-defaults resource files to go. You will have to use the environment @@ -17,7 +17,7 @@ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. -XCOMM XAPPLOADDIR = /home/user/xfig -+XAPPLOADDIR = ${X11BASE}/lib/X11/app-defaults ++XAPPLOADDIR = ${LOCALBASE}/lib/X11/app-defaults XCOMM Uncomment the following definition for XAW3D if you want to use XCOMM the 3d Athena Widget Set (highly recommended!) diff --git a/graphics/xfpovray/files/patch-aa b/graphics/xfpovray/files/patch-aa index e66a2687975a..60f9b825b8fc 100644 --- a/graphics/xfpovray/files/patch-aa +++ b/graphics/xfpovray/files/patch-aa @@ -9,12 +9,12 @@ XCOMM If your compiler can't find the xforms library -XFORMS_LIBDIR = /usr/local/lib -+XFORMS_LIBDIR = ${X11BASE}/lib ++XFORMS_LIBDIR = ${LOCALBASE}/lib XCOMM If your compiler can't find the xforms header file -XFORMS_INCDIR = /usr/local/include -+.if exists(${X11BASE}/include/X11/forms.h) -+XFORMS_INCDIR = ${X11BASE}/include/X11 ++.if exists(${LOCALBASE}/include/X11/forms.h) ++XFORMS_INCDIR = ${LOCALBASE}/include/X11 +.else -+XFORMS_INCDIR = ${X11BASE}/include ++XFORMS_INCDIR = ${LOCALBASE}/include +.endif diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index 843adc606b5f..1bfd4849151b 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfractint PORTVERSION= 20.2.04 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.sdboyd56.com/xfractint/ DISTNAME= xfract${PORTVERSION} @@ -17,7 +18,7 @@ COMMENT= The Unix port of fractint NO_WRKSUBDIR= yes USE_ZIP= yes -USE_XLIB= yes +USE_XORG= x11 MAN1= xfractint.1 diff --git a/graphics/xfractint/files/patch-Makefile b/graphics/xfractint/files/patch-Makefile index 9c4de20bd918..a13c00f8f11b 100644 --- a/graphics/xfractint/files/patch-Makefile +++ b/graphics/xfractint/files/patch-Makefile @@ -20,7 +20,7 @@ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -Wall -mpentium -DNASM #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -DNASM -CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -+CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${X11BASE}/include ++CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${LOCALBASE}/include # Gcc is often the only compiler that works for this # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE @@ -38,7 +38,7 @@ # For Linux, use #LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -+LIBS = -L${X11BASE}/lib -lX11 -lm -lcurses ++LIBS = -L${LOCALBASE}/lib -lX11 -lm -lcurses #LIBS = -lX11 -lm -lcurses # For using nasm, set: diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 807837ffda74..af450cf51906 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -7,7 +7,7 @@ PORTNAME= xli PORTVERSION= 1.17.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://pantransit.reptiles.org/prog/xli/ \ ${MASTER_SITE_XCONTRIB} @@ -22,7 +22,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER} -USE_XLIB= yes +USE_XORG= xi USE_IMAKE= yes MAN1= xli.1 xlito.1 MLINKS= xli.1 xview.1 \ diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile index 943ceb73060f..f5ef90461888 100644 --- a/graphics/xmfract/Makefile +++ b/graphics/xmfract/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmfract PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= graphics @@ -17,10 +17,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The dos based 'fractint' with an X/Motif front end USE_MOTIF= yes -USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-editres \ - --with-motif="motif_includes=${X11BASE}/include motif_libraries=${X11BASE}/lib" + --with-motif="motif_includes=${LOCALBASE}/include motif_libraries=${LOCALBASE}/lib" .include <bsd.port.pre.mk> diff --git a/graphics/xmms-blursk/Makefile b/graphics/xmms-blursk/Makefile index 0ec47d7a911e..6ed2c66ad216 100644 --- a/graphics/xmms-blursk/Makefile +++ b/graphics/xmms-blursk/Makefile @@ -7,7 +7,7 @@ PORTNAME= blursk PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://web.cecs.pdx.edu/~kirkenda/blursk/ PKGNAMEPREFIX= xmms- @@ -21,6 +21,7 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms PLIST_FILES= lib/xmms/Visualization/libblursk.so USE_GNOME= gtk12 +USE_XORG= x11 xv GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/xmms-dancingparticles/files/patch-Makefile b/graphics/xmms-dancingparticles/files/patch-Makefile index fdd9b17dbd82..23779d1ae4e5 100644 --- a/graphics/xmms-dancingparticles/files/patch-Makefile +++ b/graphics/xmms-dancingparticles/files/patch-Makefile @@ -9,8 +9,8 @@ -LFLAGS = -shared -fPIC -L/usr/local/lib -lm -lstdc++ -lGL -lGLU -L/usr/X11R6/lib -lt1 -lSDL -LFLAGS2 = -L/usr/local/lib -lm -lstdc++ -lGL -lGLU -L/usr/X11R6/lib -lpthread -lgtk -lgdk -lglut -lt1 +CFLAGS += -fPIC `gtk-config --cflags gthread` `${SDL_CONFIG} --cflags` -+LFLAGS = -shared -fPIC -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -L${X11BASE}/lib -lt1 `${SDL_CONFIG} --libs` -+LFLAGS2 = -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -L${X11BASE}/lib -lgtk -lgdk -lglut -lt1 ++LFLAGS = -shared -fPIC -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -lt1 `${SDL_CONFIG} --libs` ++LFLAGS2 = -L${LOCALBASE}/lib -lm -lstdc++ -lGL -lGLU -lgtk -lgdk -lglut -lt1 OBJ = plugin.o gl.o etoile.o readme.o parameters.o epic.o config.o signal.o t1font.o INSTALL-DIR=`xmms-config --visualization-plugin-dir` diff --git a/graphics/xmms-fishmatic/Makefile b/graphics/xmms-fishmatic/Makefile index b362729fbeb3..d05defebf991 100644 --- a/graphics/xmms-fishmatic/Makefile +++ b/graphics/xmms-fishmatic/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmms-fishmatic PORTVERSION= 0.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://stukach.com/hosted/ DISTNAME= fishmatic @@ -17,16 +17,17 @@ COMMENT= An XMMS non-static OpenGL stereogram visualization plugin BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut PLIST_FILES= lib/xmms/Visualization/libfishmatic.so USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes +USE_GL= glut +USE_XORG= xext USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="-lGL -lXext ${LIBS}" -CFLAGS+= -I${X11BASE}/include -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib post-patch: @${RM} -f ${WRKSRC}/config.cache diff --git a/graphics/xmms-msa/Makefile b/graphics/xmms-msa/Makefile index c87f83113742..ad00143245ec 100644 --- a/graphics/xmms-msa/Makefile +++ b/graphics/xmms-msa/Makefile @@ -7,7 +7,7 @@ PORTNAME= msa PORTVERSION= 0.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://republika.pl/kunik/msa/dl/ PKGNAMEPREFIX= xmms- @@ -18,12 +18,11 @@ COMMENT= A spectrum analyzer with a skin support and some visualization modes LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms USE_GMAKE= yes -USE_X_PREFIX= yes MAKE_ARGS= CC="${CC}" OPTS="${CFLAGS} -fPIC" PLIST_FILES= lib/xmms/Input/msa.so post-patch: - @${REINPLACE_CMD} -e 's|/usr/share/xmms|${X11BASE}/share/xmms|' \ + @${REINPLACE_CMD} -e 's|/usr/share/xmms|${LOCALBASE}/share/xmms|' \ ${WRKSRC}/msa_config.c do-install: diff --git a/graphics/xmms-nebulus/Makefile b/graphics/xmms-nebulus/Makefile index 606fc2ca0eb4..93f566a263a9 100644 --- a/graphics/xmms-nebulus/Makefile +++ b/graphics/xmms-nebulus/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gtk12 USE_BZIP2= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" post-patch: @${REINPLACE_CMD} -e \ diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index b07498fcd6ce..df0153737bd4 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -7,10 +7,9 @@ PORTNAME= xmorph PORTVERSION= 2006.08.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g} MAINTAINER= ports@FreeBSD.org @@ -22,14 +21,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} CONFLICTS= libmorph* -USE_X_PREFIX= yes WANT_GNOME= yes USE_GNOME= gnometarget -USE_GCC= 3.4+ -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xaw xext USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --without-waili USE_LDCONFIG= yes diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index edcfc04f08fd..647e0a84aee9 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -9,7 +9,7 @@ PORTNAME= xpaint PORTVERSION= 2.7.8.1 PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= SF \ ftp://ftp.ac-grenoble.fr/Office/ MASTER_SITE_SUBDIR= sf-${PORTNAME} @@ -21,17 +21,17 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_BZIP2= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xpaint.1 .if defined(WITH_NEXTAW) LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw -XAW_INCDIR= ${X11BASE}/include/X11/neXtaw +XAW_INCDIR= ${LOCALBASE}/include/X11/neXtaw XAW_LIBS= -lneXtaw .else -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -XAW_INCDIR= ${X11BASE}/include/X11/Xaw3d +LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +XAW_INCDIR= ${LOCALBASE}/include/X11/Xaw3d XAW_LIBS= -lXaw3d .endif diff --git a/graphics/xrml/Makefile b/graphics/xrml/Makefile index 80e1541887c7..7545a25dd6c6 100644 --- a/graphics/xrml/Makefile +++ b/graphics/xrml/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrml PORTVERSION= 0.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cs.kuleuven.ac.be/pub/graphics/software/RenderPark/ DISTNAME= ${PORTNAME} @@ -19,7 +19,6 @@ COMMENT= Extensible scene graph library based on VRML'97 WRKSRC= ${WRKDIR}/${PORTNAME:U} USE_GMAKE= yes -USE_X_PREFIX= yes USE_GL= yes USE_MOTIF= yes USE_LDCONFIG= yes @@ -43,7 +42,7 @@ post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CXX%%|${CXX}|g ; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/Config.site + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Config.site pre-build: ${GMAKE} -C ${WRKSRC}/FILTERS link_includes diff --git a/graphics/xrml/files/patch-Config.site b/graphics/xrml/files/patch-Config.site index 9c1cd76a67a7..bdde6e7a9aef 100644 --- a/graphics/xrml/files/patch-Config.site +++ b/graphics/xrml/files/patch-Config.site @@ -42,8 +42,8 @@ # and /usr/lib normally on recent Linux systems -DRIVERFLAGS = -I/usr/include $(HWFLAGS) -DRIVERLIBS = -L/usr/lib -lGLU -lGL -+DRIVERFLAGS = -I${X11BASE}/include $(HWFLAGS) -+DRIVERLIBS = -L${X11BASE}/lib -lGLU -lGL ++DRIVERFLAGS = -I${LOCALBASE}/include $(HWFLAGS) ++DRIVERLIBS = -L${LOCALBASE}/lib -lGLU -lGL # Mesa (free OpenGL-like library: www.mesa3d.org) # On recent systems, 'MesaGL' is installed as 'GL' and 'MesaGLU' as 'GLU' and @@ -52,13 +52,13 @@ # X window system flags and files: -X11HOME = /usr/X11R6 -+X11HOME = ${X11BASE} ++X11HOME = ${LOCALBASE} XINCLUDES = -I$(X11HOME)/include XLIBS = -L$(X11HOME)/lib -lXt -lXmu -lX11 $(CCMALLOCLIB) # CCMALLOCLIB = -lccmalloc -ldl -# MOTIFHOME = /usr/X11R6 -+MOTIFHOME = ${X11BASE} ++MOTIFHOME = ${LOCALBASE} # lesstif: -MOTIFHOME = /usr/X11R6/LessTif/Motif1.2 +#MOTIFHOME = /usr/X11R6/LessTif/Motif1.2 diff --git a/graphics/xsane/files/pkg-message.in b/graphics/xsane/files/pkg-message.in index c2955f8b2521..031ded4cb223 100644 --- a/graphics/xsane/files/pkg-message.in +++ b/graphics/xsane/files/pkg-message.in @@ -2,7 +2,7 @@ Congratulations, XSane is now installed. To install XSane as a GIMP plug-in, please type: -ln -sf ${X11BASE}/bin/xsane ~/.gimp-n.n/plug-ins/xsane +ln -sf ${LOCALBASE}/bin/xsane ~/.gimp-n.n/plug-ins/xsane Then run the GIMP, and a new "XSane" menu item should appear in the "File->Acquire" menu. Use this to access your scanner. diff --git a/graphics/xsvg/Makefile b/graphics/xsvg/Makefile index 557edd88af01..e50f4cafbad2 100644 --- a/graphics/xsvg/Makefile +++ b/graphics/xsvg/Makefile @@ -8,7 +8,7 @@ PORTNAME= xsvg PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -18,7 +18,6 @@ COMMENT= X11 SVG viewer LIB_DEPENDS= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo GNU_CONFIGURE= yes -USE_XLIB= yes PLIST_FILES= bin/xsvg MAN1= xsvg.1 diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile index 533656e74453..ea6ae64896f8 100644 --- a/graphics/zphoto/Makefile +++ b/graphics/zphoto/Makefile @@ -7,7 +7,7 @@ PORTNAME= zphoto PORTVERSION= 1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics www MASTER_SITES= http://namazu.org/~satoru/zphoto/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -44,7 +44,6 @@ CONFIGURE_ARGS+= --disable-zip .endif USE_GMAKE= yes USE_PERL5_BUILD=yes -USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure |