diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /x11-toolkits | |
| parent | Update to version 2.2.6 (diff) | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'x11-toolkits')
112 files changed, 217 insertions, 254 deletions
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile index 7fb73fc8f0f2..167cc8b9cb9d 100644 --- a/x11-toolkits/SoXt/Makefile +++ b/x11-toolkits/SoXt/Makefile @@ -21,7 +21,7 @@ USE_MOTIF= yes USE_PERL5_BUILD= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${X11BASE} +CONFIGURE_ARGS+= --with-pthread=yes --with-coin=${LOCALBASE} # avoid renaming of soxt-config and soxt-config.1 CONFIGURE_TARGET= --target="" USE_LDCONFIG= yes diff --git a/x11-toolkits/Xaw3d/files/pkg-message.in b/x11-toolkits/Xaw3d/files/pkg-message.in index 6bfd4a6fdef1..524bf4343d50 100644 --- a/x11-toolkits/Xaw3d/files/pkg-message.in +++ b/x11-toolkits/Xaw3d/files/pkg-message.in @@ -2,7 +2,7 @@ If you want Xaw3d to replace the default Athena Widget Set so most X applications will get a 3-D look, do this (as root): -cd %%X11BASE%%/lib +cd %%LOCALBASE%%/lib mv libXaw.so.%%XAWVER%% libXaw2d.so.%%XAWVER%% ln -s libXaw3d.so.%%XAWVER%% libXaw.so.%%XAWVER%% ******************************************************************* diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile index cf0d983bf74b..806eb835f7b5 100644 --- a/x11-toolkits/XawPlus/Makefile +++ b/x11-toolkits/XawPlus/Makefile @@ -20,13 +20,13 @@ USE_XORG= x11 xaw WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ARGS= CC="${CC}" FLAGS="${CFLAGS} -fPIC -DHAS_WCHAR_H" \ - INC_PATH="-I. -I${X11BASE}/include" LIB_PATH="-L${X11BASE}/lib" + INC_PATH="-I. -I${LOCALBASE}/include" LIB_PATH="-L${LOCALBASE}/lib" ALL_TARGET= lib USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's:so\.3\..:so.3:' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's:%%X11BASE%%:${X11BASE}:' ${WRKSRC}/test/Makefile + @${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' ${WRKSRC}/test/Makefile do-install: @${MKDIR} ${PREFIX}/include/X11/XawPlus diff --git a/x11-toolkits/XawPlus/files/patch-test::Makefile b/x11-toolkits/XawPlus/files/patch-test::Makefile index e0450de740ab..2d8c3dd64ba0 100644 --- a/x11-toolkits/XawPlus/files/patch-test::Makefile +++ b/x11-toolkits/XawPlus/files/patch-test::Makefile @@ -14,7 +14,7 @@ $FreeBSD$ -LIB_PATH = -L/usr/X11/lib # Libraries for X -INC_PATH = -I/usr/X11/include # Header for X -+PREFIX=%%X11BASE%% ++PREFIX=%%XLOCALBASE%% + +LIB_PATH = -L$(PREFIX)/lib # Libraries for X +INC_PATH = -I$(PREFIX)/include # Header for X diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile index 67a098310368..c3c071128f56 100644 --- a/x11-toolkits/efltk/Makefile +++ b/x11-toolkits/efltk/Makefile @@ -7,9 +7,9 @@ PORTNAME= efltk PORTVERSION= 2.0.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ede +MASTER_SITES= SF/ede MAINTAINER= sem@FreeBSD.org COMMENT= Extended Fast Light Toolkit @@ -27,7 +27,6 @@ CONFIGURE_ARGS+= --disable-mysql USE_MYSQL= yes .endif -USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= autoconf:213 @@ -36,6 +35,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include" MAKE_ENV+= LD_LIBRARY_PATH="${WRKSRC}/lib" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes +USE_XORG= x11 xext .include <bsd.port.mk> diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile index ea053d3f2564..459fc9acca17 100644 --- a/x11-toolkits/enhance/Makefile +++ b/x11-toolkits/enhance/Makefile @@ -8,7 +8,7 @@ PORTNAME= enhance PORTVERSION= 20080223 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ @@ -17,7 +17,6 @@ COMMENT= A library for rapid application development with ETK/Glade USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes USE_GNOME= gnomehack pkgconfig gnometarget USE_LDCONFIG= yes USE_EFL= ecore etk exml diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile index 3f633b77cf07..ac477c725445 100644 --- a/x11-toolkits/flu/Makefile +++ b/x11-toolkits/flu/Makefile @@ -7,7 +7,7 @@ PORTNAME= flu PORTVERSION= 2.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://www.osc.edu/~jbryan/FLU/ DISTNAME= FLU_${PORTVERSION} @@ -17,10 +17,10 @@ COMMENT= A library containing extra widgets for FLTK LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk -USE_GL= yes +USE_GL= gl USE_LDCONFIG= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --I=${X11BASE}/include --L=${X11BASE}/lib +CONFIGURE_ARGS= --prefix=${PREFIX} --I=${LOCALBASE}/include --L=${LOCALBASE}/lib USE_GMAKE= yes PORTDOCS= * diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile index b12e9587c43d..48293ad5b72a 100644 --- a/x11-toolkits/fox12/Makefile +++ b/x11-toolkits/fox12/Makefile @@ -39,8 +39,8 @@ USE_LDCONFIG= yes MAN1= shutterbug.1 reswrap.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib OPTIONS= XFT "Enable Xft support" on \ SHM "Enable Shared Memory support" on \ diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index d0f5c30d5e75..83e62a50cc5f 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -39,8 +39,8 @@ USE_LDCONFIG= yes MAN1= shutterbug.1 reswrap.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib OPTIONS= OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \ CUPS "Enable CUPS support" off \ diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile index 648831563951..7e292b55ceb8 100644 --- a/x11-toolkits/fox16/Makefile +++ b/x11-toolkits/fox16/Makefile @@ -38,8 +38,8 @@ USE_LDCONFIG= yes MAN1= shutterbug.1 reswrap.1 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib OPTIONS= XFT "Enable Xft support" on \ SHM "Enable Shared Memory support" on \ diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile index a2be4b266a7c..6475b66a083a 100644 --- a/x11-toolkits/gai/Makefile +++ b/x11-toolkits/gai/Makefile @@ -8,10 +8,9 @@ PORTNAME= gai PORTVERSION= 0.5.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= lx@redundancy.redundancy.org COMMENT= General Applet Interface Library @@ -19,7 +18,7 @@ COMMENT= General Applet Interface Library LIB_DEPENDS= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext USE_BZIP2= yes -USE_GL= yes +USE_GL= gl USE_SDL= sdl USE_GNOME= gnomepanel GNU_CONFIGURE= yes @@ -30,11 +29,11 @@ PLIST_FILES= include/gai/gai.h lib/libgai.so.${PORTVERSION} \ share/locale/de/LC_MESSAGES/gai.mo PLIST_DIRS= include/gai PORTDOCS= * -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \ - s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/configure + s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in index e023337f203c..11088b83c594 100644 --- a/x11-toolkits/gai/files/patch-gai_Makefile.in +++ b/x11-toolkits/gai/files/patch-gai_Makefile.in @@ -8,7 +8,7 @@ +CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@ -LDFLAGS += -g -fPIC -L/usr/X11R6/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ -+LDFLAGS += -fPIC -L$(X11BASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ ++LDFLAGS += -fPIC -L$(LOCALBASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ LDFLAGS += @GNOME_LIBS@ @GL_LIBS@ @SDL_LIBS@ @GTHREAD_LIBS@ @PANGO_LIBS@ CC = @CC@ diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index e97e654c05ec..b593cac91b9f 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -7,7 +7,7 @@ PORTNAME= gal PORTVERSION= 0.24 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.24 @@ -19,7 +19,7 @@ COMMENT= A collection of widgets taken from GNOME gnumeric and evolution LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier libglade gnomevfs diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 135a82205632..eab6728ee157 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gal2 PORTVERSION= 2.5.3 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \ ltverhack USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --enable-static --with-libiconv diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index b7b0a7b7d7fc..ab2965e87cdd 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -7,6 +7,7 @@ # PORTNAME= gdl +PORTREVISION= 1 PORTVERSION= 0.7.11 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME @@ -16,7 +17,6 @@ COMMENT= Components intended to be shared between GNOME development tools USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack libgnomeui USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index 9be85de3ff5e..2d9cf5049a35 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -7,10 +7,9 @@ PORTNAME= gnocl PORTVERSION= 0.9.90 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnocl +MASTER_SITES= SF/gnocl MAINTAINER= ports@FreeBSD.org COMMENT= GTK+ and Gnome extension for Tcl @@ -19,12 +18,11 @@ BUILD_DEPENDS= ${LOCALBASE}/include/tcl8.4/tcl.h:${PORTSDIR}/lang/tcl84 USE_GMAKE= yes USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BUILD_WRKSRC= ${WRKSRC}/src CFLAGS+= -I${LOCALBASE}/include/tcl8.4 -USE_X_PREFIX= yes USE_GNOME= gtk20 .include <bsd.port.pre.mk> diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index d7591fcb4a31..b149f837e2fc 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 1.2.10 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gtk+/1.2 @@ -16,8 +16,8 @@ DISTNAME= gtk+-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (previous stable version) -USE_XLIB= yes USE_PERL5= yes +USE_XORG= x11 ice xext sm inputproto xi USE_GNOME= glib12 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 13e10e3a5e9a..ff45cf8b855c 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.12.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -41,11 +41,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes -USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \ - xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \ - xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \ - xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \ - xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 13e10e3a5e9a..ff45cf8b855c 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.12.9 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -41,11 +41,7 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes -USE_XORG= dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \ - xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \ - xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \ - xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \ - xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile index 0a0428db61f1..8e3c04ad14c0 100644 --- a/x11-toolkits/gtkdatabox2/Makefile +++ b/x11-toolkits/gtkdatabox2/Makefile @@ -18,7 +18,7 @@ COMMENT= A GTK+2 widget to display large amounts of numerical data USE_GNOME= gtk20 USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFLICTS= gtkdatabox-0.1.* diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile index 5c343aaa92f2..d47c98bdc5e4 100644 --- a/x11-toolkits/gtkglarea--/Makefile +++ b/x11-toolkits/gtkglarea--/Makefile @@ -30,8 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-lib-GL USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU \ +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lGL -lGLU \ ${PTHREAD_LIBS} post-patch: diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile index 19b08b180d4a..3acb314f00ad 100644 --- a/x11-toolkits/gtkscintilla/Makefile +++ b/x11-toolkits/gtkscintilla/Makefile @@ -9,7 +9,7 @@ PORTNAME= gtkscintilla PORTVERSION= 0.8.2 PORTREVISION= 5 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= moleskine DISTNAME= GtkScintilla-${PORTVERSION} diff --git a/x11-toolkits/gtkscintilla/files/patch-aa b/x11-toolkits/gtkscintilla/files/patch-aa index 3bc361620331..5a77f159c259 100644 --- a/x11-toolkits/gtkscintilla/files/patch-aa +++ b/x11-toolkits/gtkscintilla/files/patch-aa @@ -20,7 +20,7 @@ $FreeBSD$ -CFLAGS = $(shell gtk-config --cflags) -g -Wall -DGTK -DSCI_LEXER -LDFLAGS_PRE = $(shell gtk-config --libs) -DGTK -LDFLAGS_POST = $(LEXERS) $(SCINTILLA_LIB) -lstdc++ -+SCINTILLA_INCLUDE = $(X11BASE)/include/scintilla ++SCINTILLA_INCLUDE = $(LOCALBASE)/include/scintilla +SCINTILLA_LIB = -lscintilla +SCINTILLA_IFACE = scintilla/include/Scintilla.iface +LEXERS = -lscintilla_lexers diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index 2c769257c55c..63e63ba36598 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview PORTVERSION= 1.8.5 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +22,6 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index bc77ffdda8ab..43805f728024 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtksourceview2 PORTVERSION= 2.2.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,6 @@ COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile index 6ea8a33ab896..e6912d1fc7c4 100644 --- a/x11-toolkits/guile-gtk/Makefile +++ b/x11-toolkits/guile-gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= guile-gtk PORTVERSION= 0.60 +PORTREVISION= 1 CATEGORIES= x11-toolkits scheme MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +17,6 @@ COMMENT= Guile binding library for GTK+ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnometarget ltverhack gdkpixbuf libglade USE_AUTOTOOLS= libtool:15 diff --git a/x11-toolkits/hs-frantk/files/patch-src::Makefile b/x11-toolkits/hs-frantk/files/patch-src::Makefile index 3766c69e9c3d..1f9777ac186a 100644 --- a/x11-toolkits/hs-frantk/files/patch-src::Makefile +++ b/x11-toolkits/hs-frantk/files/patch-src::Makefile @@ -26,7 +26,7 @@ -CC_INC = -I/usr/X11/include -I/usr/local/include +#CC = gcc +CC_OPTS = ${CFLAGS} -+CC_INC = -I${X11BASE}/include -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4 ++CC_INC = -I${LOCALBASE}/include -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4 -GHC = ghc-5.00.2 -GHC-PKG=ghc-pkg-5.00.2 @@ -51,7 +51,7 @@ # The directories containing the X11, Tcl and Tk (binary) libraries: -CCLIB = -L /usr/lib/X11 -L /usr/local/lib -+CCLIB = -L ${X11BASE}/lib/X11 -L /usr/local/lib ++CCLIB = -L ${LOCALBASE}/lib/X11 -L /usr/local/lib # the libraries required by Tcl/Tk: diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib index 420cb3e3086f..5fbff64a0cd5 100644 --- a/x11-toolkits/itk/files/Makefile.lib +++ b/x11-toolkits/itk/files/Makefile.lib @@ -5,7 +5,7 @@ CFLAGS+= -I. -I./../generic \ -I${TCL_INCLUDEDIR}/generic \ -I${PREFIX}/include/itcl${MAJOR}.${MINOR}/ \ -I${TK_INCLUDEDIR}/generic \ - -I${X11BASE}/include \ + -I${LOCALBASE}/include \ -DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\ -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\ -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\ @@ -14,7 +14,7 @@ CFLAGS+= -I. -I./../generic \ -DHAVE_SYS_FILIO_H=1 \ -DRETSIGTYPE=void \ -DITK_LIBRARY=\"${ITK_LIBRARY}\" -LDADD+= -L${PREFIX}/lib -litcl -L${X11BASE}/lib -lX11 -ltk${USE_TK} +LDADD+= -L${PREFIX}/lib -litcl -L${LOCALBASE}/lib -lX11 -ltk${USE_TK} .PATH: ${.CURDIR}/generic diff --git a/x11-toolkits/jdic/Makefile b/x11-toolkits/jdic/Makefile index d6114f73aabd..6dd4232f4a69 100644 --- a/x11-toolkits/jdic/Makefile +++ b/x11-toolkits/jdic/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdic PORTVERSION= 20061102 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits java MASTER_SITES= https://jdic.dev.java.net/files/documents/880/43269/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS_REASON= the required com.sun.jnlp is part of jawaws.jar, only ins USE_ZIP= yes USE_ANT= yes -USE_XLIB= yes +USE_XORG= x11 xext USE_GNOME= pkgconfig # libgnome USE_JAVA= yes JAVA_VERSION= 1.5+ @@ -53,7 +53,7 @@ PLIST_FILES= %%JAVAJARDIR%%/jdic.jar \ pre-configure: .for mk in ${MKFILES} - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \ + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ s|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/jdic/src/unix/native/${mk}/Makefile .endfor diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 66d0623c6786..b6db9143479e 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -8,7 +8,7 @@ PORTNAME= libbonoboui PORTVERSION= 2.22.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +22,6 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) USE_GETTEXT= yes -USE_XLIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack \ diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile index da6404778222..8ecf1d868ada 100644 --- a/x11-toolkits/libbonobouimm/Makefile +++ b/x11-toolkits/libbonobouimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libbonobouimm PORTVERSION= 1.3.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,11 +21,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack gnomeprefix libbonoboui USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 47b92a91db78..57a222cd17c3 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgail-gnome PORTVERSION= 1.20.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +18,6 @@ COMMENT= An implementation of the ATK interfaces for GNOME widgets USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile index c00d621b9adf..8892a673809a 100644 --- a/x11-toolkits/libgdiplus/Makefile +++ b/x11-toolkits/libgdiplus/Makefile @@ -8,7 +8,7 @@ PORTNAME= libgdiplus PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://go-mono.com/sources/${PORTNAME}/ @@ -17,13 +17,15 @@ COMMENT= GDI+ API for System.Windows.Forms in Mono LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ - png.5:${PORTSDIR}/graphics/png + png.5:${PORTSDIR}/graphics/png \ + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ + freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes USE_GNOME= gnomehack gnometarget glib20 USE_GMAKE= yes -INSTALLS_SHLIB= yes -USE_XLIB= yes +USE_XORG= x11 xrender +USE_LDCONFIG= yes LIBTOOLFILES= configure cairo/configure USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 11375f7efe7c..83b7b51258fb 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomeprintui PORTVERSION= 2.18.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,8 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= x11 xpm USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ intlhack ltverhack diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile index caccf4604d7d..6dd936cb6da6 100644 --- a/x11-toolkits/libgnomeprintuimm/Makefile +++ b/x11-toolkits/libgnomeprintuimm/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnomeprintuimm PORTVERSION= 2.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.5 @@ -22,11 +22,9 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprintui -USE_GCC= 3.4+ -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile index 92af142277b0..10b52aef17ec 100644 --- a/x11-toolkits/libgnomeuimm/Makefile +++ b/x11-toolkits/libgnomeuimm/Makefile @@ -7,10 +7,9 @@ PORTNAME= libgnomeuimm PORTVERSION= 2.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-toolkits gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkmm +MASTER_SITES= SF/gtkmm DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org @@ -22,11 +21,10 @@ LIB_DEPENDS= gnomemm-2.0:${PORTSDIR}/x11/libgnomemm \ glademm-2.0:${PORTSDIR}/devel/libglademm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack libgnomeui USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index fd926d660f85..e7b2f78a7522 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomeuimm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -27,12 +28,11 @@ LATEST_LINK= libgnomeuimm26 USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libgnomeui GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static PLIST_SUB= VERSION="2.6" API_VERSION="2.6" diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index c7c168614fa1..0b860d490958 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgtk-java PORTVERSION= 2.10.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Java wrapper for Gtk+, Pango, Atk, and Glib LIB_DEPENDS= cairojni-${CAIRO_API_VERSION}.1:${PORTSDIR}/graphics/cairo-java USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile index a9251b339c7d..4f65bafbc224 100644 --- a/x11-toolkits/libpanelappletmm/Makefile +++ b/x11-toolkits/libpanelappletmm/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpanelappletmm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -21,9 +22,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack lthack gnomepanel USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 15f0627fcf9e..021312fd41b3 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -7,7 +7,7 @@ PORTNAME= libzvt PORTVERSION= 2.0.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library components for Zed's Virtual Terminal USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile index 4dd5f4b0f1d7..adb044dcbd61 100644 --- a/x11-toolkits/linux-f10-gtk/Makefile +++ b/x11-toolkits/linux-f10-gtk/Makefile @@ -20,7 +20,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} USE_XLIB= yes diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile index 1dafd3ad6f80..8b06cf40192a 100644 --- a/x11-toolkits/linux-f10-gtk2/Makefile +++ b/x11-toolkits/linux-f10-gtk2/Makefile @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XLIB= yes USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB= LIBVERSION="600.10" PORTVERSION="${PORTVERSION}" SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \ diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile index 9f0c8a58bcf2..2e60b92a475d 100644 --- a/x11-toolkits/linux-f10-pango/Makefile +++ b/x11-toolkits/linux-f10-pango/Makefile @@ -26,7 +26,7 @@ USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB+= LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}" diff --git a/x11-toolkits/linux-f10-qt33/Makefile b/x11-toolkits/linux-f10-qt33/Makefile index 347e898de162..753837c5d79b 100644 --- a/x11-toolkits/linux-f10-qt33/Makefile +++ b/x11-toolkits/linux-f10-qt33/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux USE_LINUX_RPM= yes RPMVERSION= 15.5 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} .include <bsd.port.mk> diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile index 4dd5f4b0f1d7..adb044dcbd61 100644 --- a/x11-toolkits/linux-f8-gtk/Makefile +++ b/x11-toolkits/linux-f8-gtk/Makefile @@ -20,7 +20,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} USE_XLIB= yes diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile index 1dafd3ad6f80..8b06cf40192a 100644 --- a/x11-toolkits/linux-f8-gtk2/Makefile +++ b/x11-toolkits/linux-f8-gtk2/Makefile @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XLIB= yes USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB= LIBVERSION="600.10" PORTVERSION="${PORTVERSION}" SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \ diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile index 9f0c8a58bcf2..2e60b92a475d 100644 --- a/x11-toolkits/linux-f8-pango/Makefile +++ b/x11-toolkits/linux-f8-pango/Makefile @@ -26,7 +26,7 @@ USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB+= LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}" diff --git a/x11-toolkits/linux-f8-qt33/Makefile b/x11-toolkits/linux-f8-qt33/Makefile index 347e898de162..753837c5d79b 100644 --- a/x11-toolkits/linux-f8-qt33/Makefile +++ b/x11-toolkits/linux-f8-qt33/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux USE_LINUX_RPM= yes RPMVERSION= 15.5 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} .include <bsd.port.mk> diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile index 4dd5f4b0f1d7..adb044dcbd61 100644 --- a/x11-toolkits/linux-gtk/Makefile +++ b/x11-toolkits/linux-gtk/Makefile @@ -20,7 +20,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} USE_XLIB= yes diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile index 1dafd3ad6f80..8b06cf40192a 100644 --- a/x11-toolkits/linux-gtk2/Makefile +++ b/x11-toolkits/linux-gtk2/Makefile @@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_XLIB= yes USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB= LIBVERSION="600.10" PORTVERSION="${PORTVERSION}" SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \ diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile index 9f0c8a58bcf2..2e60b92a475d 100644 --- a/x11-toolkits/linux-pango/Makefile +++ b/x11-toolkits/linux-pango/Makefile @@ -26,7 +26,7 @@ USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes BRANDELF_DIRS= usr/bin PLIST_SUB+= LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}" diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile index 347e898de162..753837c5d79b 100644 --- a/x11-toolkits/linux-qt33/Makefile +++ b/x11-toolkits/linux-qt33/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux USE_LINUX_RPM= yes RPMVERSION= 15.5 LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST= pkg-plist.${LINUX_RPM_ARCH} .include <bsd.port.mk> diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile index 9a8361e018b1..e6de52a891a6 100644 --- a/x11-toolkits/mesgui/Makefile +++ b/x11-toolkits/mesgui/Makefile @@ -7,10 +7,9 @@ PORTNAME= mesgui PORTVERSION= 1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Make a simple GUI under OpenGL @@ -18,16 +17,16 @@ COMMENT= Make a simple GUI under OpenGL LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_SDL= sdl -USE_GL= yes +USE_GL= gl USE_GMAKE= yes MAKE_ENV= OPT="${OPT}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes OPT= ${CFLAGS} -fPIC -DPIC -Iinclude \ `${SDL_CONFIG} --cflags` `freetype-config --cflags` \ - -I${LOCALBASE}/include -I${X11BASE}/include + -I${LOCALBASE}/include LDFLAGS= `${SDL_CONFIG} --libs` `freetype-config --libs` \ - -L${LOCALBASE}/lib -L${X11BASE}/lib + -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|^CC|#CC|g ; \ diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile index 6e29125ba5bb..ff7cf12aad1f 100644 --- a/x11-toolkits/mowitz/Makefile +++ b/x11-toolkits/mowitz/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d USE_AUTOTOOLS= libtool:15 USE_XORG= xpm -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xawm=Xaw3d diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile index 6f0eb05f5038..854c970956a0 100644 --- a/x11-toolkits/neXtaw/Makefile +++ b/x11-toolkits/neXtaw/Makefile @@ -7,7 +7,7 @@ PORTNAME= neXtaw PORTVERSION= 0.15.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://siag.nu/pub/neXtaw/ @@ -15,11 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Athena Widgets with N*XTSTEP appearance USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes +USE_XORG= xmu x11 xext GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes post-patch: diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index b6cd2366de74..38c6cf5ecd72 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -10,7 +10,7 @@ PORTNAME= open-motif PORTVERSION= 2.2.3 PORTREVISION= 5 CATEGORIES= x11-toolkits -MASTER_SITES= http://ftp.motifzone.com/%SUBDIR%/ +MASTER_SITES= http://ftp.motifzone.com/%SUBDIR%/ MASTER_SITE_SUBDIR= om${PORTVERSION}/src DISTNAME= openMotif-${PORTVERSION} EXTRACT_SUFX= .tar.gz @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_XORG= xaw xbitmaps GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAKE_ENV= LANG=C DEMOS_SRC= ${WRKSRC}/demos/programs diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index 261193eda4a5..ace18fb54cd5 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -44,7 +44,7 @@ MAN3= Prima::Clipboard.3.gz Prima::Drawable.3.gz Prima::File.3.gz Prima::Image.3 CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALL_MAN3="${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3" \ - INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${X11BASE}" + INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${LOCALBASE}" CONFIGURE_SCRIPT= Makefile.PL USE_XORG= x11 xpm xext xrender USE_PERL5= yes diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile index 03a8394815d5..f2276fc50bec 100644 --- a/x11-toolkits/p5-TclTk/Makefile +++ b/x11-toolkits/p5-TclTk/Makefile @@ -24,7 +24,7 @@ PERL_CONFIGURE= yes MAN3= Tcl::Tk.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 do-configure: -@cd ${CONFIGURE_WRKSRC} && \ diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile index 2fe2ac550fae..3d1502566fb6 100644 --- a/x11-toolkits/p5-Tk-TableMatrix/Makefile +++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= 5.8.0+ -CONFIGURE_ARGS= X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include +CONFIGURE_ARGS= X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include MAN3= Tk::TableMatrix.3 \ Tk::TableMatrix::Spreadsheet.3 \ diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index 66362ddec61f..e61dd5b9316f 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -17,7 +17,7 @@ COMMENT= A re-port of a perl5 interface to Tk8.4 PERL_CONFIGURE= 5.8.0+ USE_XORG= x11 -CONFIGURE_ARGS= X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include +CONFIGURE_ARGS= X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include WRKSRC= ${WRKDIR}/${DISTNAME} MAN1= ptked.1 \ diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile index 9ca35c32c473..5114edeec114 100644 --- a/x11-toolkits/paragui-devel/Makefile +++ b/x11-toolkits/paragui-devel/Makefile @@ -29,7 +29,7 @@ LIBTOOLFLAGS= --disable-ltlibs --release-ignore CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_VER= 4 PLIST_SUB= SHLIB_VER="${SHLIB_VER}" diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile index ce0d341cc569..caec5399e048 100644 --- a/x11-toolkits/paragui/Makefile +++ b/x11-toolkits/paragui/Makefile @@ -26,7 +26,7 @@ USE_AUTOTOOLS= libtool:15 USE_SDL= sdl image ttf CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SHLIB_VER= 4 PLIST_SUB= SHLIB_VER="${SHLIB_VER}" diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile index 9333cae05e5c..ad775ffe18a2 100644 --- a/x11-toolkits/php-gtk/Makefile +++ b/x11-toolkits/php-gtk/Makefile @@ -24,7 +24,7 @@ IGNORE_WITH_PHP= 5 USE_GMAKE= yes USE_PERL5_BUILD=yes USE_GNOME= gtk12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION} OPTIONS= LIBGLADE "GladeXML support in php-gtk" on \ @@ -68,7 +68,7 @@ PLIST_SUB+= GDKPIXBUF="@comment " .if !defined(WITHOUT_GTKHTML) USE_GNOME+= gtkhtml CONFIGURE_ARGS+= --enable-gtkhtml -ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0 +ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0 PLIST_SUB+= GTKHTML="" .else PLIST_SUB+= GTKHTML="@comment " diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile index 9333cae05e5c..ad775ffe18a2 100644 --- a/x11-toolkits/php-gtk2/Makefile +++ b/x11-toolkits/php-gtk2/Makefile @@ -24,7 +24,7 @@ IGNORE_WITH_PHP= 5 USE_GMAKE= yes USE_PERL5_BUILD=yes USE_GNOME= gtk12 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION} OPTIONS= LIBGLADE "GladeXML support in php-gtk" on \ @@ -68,7 +68,7 @@ PLIST_SUB+= GDKPIXBUF="@comment " .if !defined(WITHOUT_GTKHTML) USE_GNOME+= gtkhtml CONFIGURE_ARGS+= --enable-gtkhtml -ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0 +ENVSCE+= -DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0 PLIST_SUB+= GTKHTML="" .else PLIST_SUB+= GTKHTML="@comment " diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index cd3ae23ed2a5..fd90e4db1ee0 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -7,19 +7,19 @@ PORTNAME= plib PORTVERSION= 1.8.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://plib.sourceforge.net/dist/ MAINTAINER= jylefort@FreeBSD.org COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math -USE_GL= yes +USE_GL= glu USE_GMAKE= yes GNU_CONFIGURE= yes CXXFLAGS+= -fPIC -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-build: ${CC} ${CFLAGS} -o ${WRKDIR}/plib-jscal ${FILESDIR}/jsBSDCal.c diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile index 9469499ca404..ce7532f11318 100644 --- a/x11-toolkits/py-fox/Makefile +++ b/x11-toolkits/py-fox/Makefile @@ -9,7 +9,7 @@ PORTNAME= fox PORTVERSION= 1.0.5 PORTREVISION= 2 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= fxpy PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= FXPy-${PORTVERSION} @@ -30,7 +30,7 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-patch: - ${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/setup.py + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py do-install: @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS}) diff --git a/x11-toolkits/py-fox/files/patch-setup b/x11-toolkits/py-fox/files/patch-setup index fb2d40fe3576..0ebeea955eca 100644 --- a/x11-toolkits/py-fox/files/patch-setup +++ b/x11-toolkits/py-fox/files/patch-setup @@ -7,8 +7,8 @@ + XLIBINC = [] else: - XLIBDIR = ['/usr/X11R6/lib'] -+ XLIBDIR = ['%%X11BASE%%/lib'] -+ XLIBINC = ['%%X11BASE%%/include'] ++ XLIBDIR = ['%%LOCALBASE%%/lib'] ++ XLIBINC = ['%%LOCALBASE%%/include'] # Other libraries OLIBDIRS = ['c:\cygwin\usr\local\lib'] diff --git a/x11-toolkits/py-tkinter/files/setup.py b/x11-toolkits/py-tkinter/files/setup.py index 8bf615a02b02..a3bd3da94179 100644 --- a/x11-toolkits/py-tkinter/files/setup.py +++ b/x11-toolkits/py-tkinter/files/setup.py @@ -18,7 +18,7 @@ except: tkversion = "8.4" prefix = sysconfig.PREFIX # Python 1.5 doesn't have os.getenv()? -x11base = os.environ['X11BASE'] or '/usr/X11R6' +x11base = os.environ['LOCALBASE'] or '/usr/X11R6' inc_dirs = [prefix + "/include", prefix + "/include/tcl" + tkversion, prefix + "/include/tk" + tkversion, diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile index 80e4d48a9931..bfe8db0f3e83 100644 --- a/x11-toolkits/py-wmdockapps/Makefile +++ b/x11-toolkits/py-wmdockapps/Makefile @@ -23,6 +23,6 @@ PYDISTUTILS_PKGNAME= pywmdockapps USE_XORG= x11 xpm xau xext xfixes xi post-patch: - ${REINPLACE_CMD} 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/setup.py + ${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/setup.py .include <bsd.port.mk> diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 6bb94353f176..1c4647d86a34 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -98,7 +98,7 @@ PYDISTUTILS_BUILDARGS+= \ NO_HEADERS=1 \ NO_SCRIPTS=1 \ INSTALL_MULTIVERSION=0 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes . if defined(WITH_WXPYTHON_UNICODE) WX_UNICODE= yes diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile index 5b4f8dea4d5d..45d5e83c4abf 100644 --- a/x11-toolkits/qscintilla/Makefile +++ b/x11-toolkits/qscintilla/Makefile @@ -31,7 +31,7 @@ OPTIONS= DESIGNER_PLUGIN "Install plugin for Qt Designer" on \ QMAKE= ${LOCALBASE}/bin/qmake SPEC= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -PLUGINDIR= ${X11BASE}/lib/plugins/designer +PLUGINDIR= ${LOCALBASE}/lib/plugins/designer .include <bsd.port.pre.mk> @@ -89,9 +89,9 @@ post-configure: ${MV} Makefile.tmp Makefile && \ cd ${WRKSRC}/designer && \ ${CAT} designer.pro | ${GREP} -v lqscintilla > designer.tmp && \ - ${ECHO} "INCPATH += ${X11BASE}/include ../qt" >> \ + ${ECHO} "INCPATH += ${LOCALBASE}/include ../qt" >> \ designer.tmp && \ - ${ECHO} "LIBS += -L../qt -L${X11BASE}/lib -lqscintilla" >> \ + ${ECHO} "LIBS += -L../qt -L${LOCALBASE}/lib -lqscintilla" >> \ designer.tmp && \ ${ECHO} "DESTDIR = ." >> designer.tmp && \ ${MV} designer.tmp designer.pro ) diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 2c41a6c0c872..f9564fcf9c1c 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.3.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= x11-toolkits ipv6 MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -30,7 +30,6 @@ CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \ USE_BZIP2= yes REINPLACE_ARGS= -i "" -USE_X_PREFIX= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -77,10 +76,10 @@ PACKAGE_COOKIE= ${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g} PREFIX_REAL!= /bin/realpath ${PREFIX} -# The previous Qt port versions installed qmake and qmake's specs under X11BASE +# The previous Qt port versions installed qmake and qmake's specs under LOCALBASE # The new devel/qmake port installs them under LOCALBASE. We can use # either one here, but we prefer the newer: -.for d in ${X11BASE} ${LOCALBASE} ${PREFIX} +.for d in ${LOCALBASE} ${PREFIX} . if exists($d/share/qt/mkspecs/freebsd-g++/qplatformdefs.h) QTBASE=$d PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++ @@ -157,7 +156,7 @@ CONFLICTS+= qt-3.3.* CONFLICTS+= qt-copy-[0-9]* .endif -.if exists(${X11BASE}/include/qt2/qapp.h) +.if exists(${LOCALBASE}/include/qt2/qapp.h) BROKEN= You have QT2 headers installed! Installing this port BROKEN+=will result in conflicts between QT3 and QT2! .endif diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 1be9f8b3140e..8ab844b78fbc 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -8,7 +8,7 @@ PORTNAME= gui PORTVERSION= ${QT4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= x11-toolkits MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,7 +18,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface library -LIB_DEPENDS?= png:${PORTSDIR}/graphics/png +LIB_DEPENDS?= png:${PORTSDIR}/graphics/png \ + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib @@ -27,7 +28,8 @@ QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_XLIB= yes +USE_XORG= xrender xrandr xinerama inputproto xfixes sm xcursor \ + xext x11 ice xi xt ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile index 5431d532ebe9..9d2a82da3c5b 100644 --- a/x11-toolkits/qwt4/Makefile +++ b/x11-toolkits/qwt4/Makefile @@ -9,7 +9,7 @@ PORTNAME= qwt PORTVERSION= 4.2.0 PORTREVISION= 4 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR=qwt MAINTAINER= makc@issp.ac.ru diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index 580088b73b61..1407d5c15b1c 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= rep-gtk2 PORTVERSION= 0.18 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -21,7 +21,6 @@ LIB_DEPENDS= rep.13:${PORTSDIR}/lang/librep PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= libglade2 WANT_GNOME= yes diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile index 1ca0a8bffdae..e2b43f25b206 100644 --- a/x11-toolkits/ruby-fox10/Makefile +++ b/x11-toolkits/ruby-fox10/Makefile @@ -9,8 +9,7 @@ PORTNAME= fox PORTVERSION= 1.0.29 PORTREVISION= 5 CATEGORIES= x11-toolkits ruby -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fxruby +MASTER_SITES= SF/fxruby PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= FXRuby-${PORTVERSION} DIST_SUBDIR= ruby @@ -39,7 +38,7 @@ DOCS_EN= ANNOUNCE ChangeLog README \ post-patch: ${RUBY} -i -p \ -e 'gsub %r:/usr/local\b:, "${LOCALBASE}"' \ - -e 'gsub %r:/usr/X11R6\b:, "${X11BASE}"' \ + -e 'gsub %r:/usr/X11R6\b:, "${LOCALBASE}"' \ ${WRKSRC}/ext/fox/extconf.rb post-install: diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 2e61dbd2a625..049d867e20d6 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -35,11 +35,11 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README post-patch: general-patch - @${REINPLACE_CMD} -e 's|/usr/share|${X11BASE}/share|g' \ + @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \ ${WRKSRC}/sample/gtk-demo/common.rb @${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \ ${WRKSRC}/sample/misc/button2.rb - @${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g' \ + @${REINPLACE_CMD} -e 's|/usr/local/share|${LOCALBASE}/share|g' \ ${WRKSRC}/sample/testgtk/testgtk* @${FIND} ${WRKSRC} -name '*.bak' -delete diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile index ae596dd93438..68e9716664f7 100644 --- a/x11-toolkits/ruby-tk/Makefile +++ b/x11-toolkits/ruby-tk/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 PORTREVISION= ${RUBY_PORTREVISION} PORTEPOCH= 1 CATEGORIES+= x11-toolkits ruby tcl tk @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch USE_RUBY= yes USE_RUBY_EXTCONF= yes RUBY_EXTCONF_SUBDIRS= . tkutil -USE_XLIB= yes +USE_XORG= x11 WRKSRC= ${WRKDIR}/${PORTNAME} @@ -41,7 +41,7 @@ LIB_DEPENDS= tcl${TK_VERSION:S/.//}:${TCLPORTDIR}${TK_VERSION:C/[^0-9]//g} \ .include <bsd.port.pre.mk> CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ - --with-X11-dir=${X11BASE} \ + --with-X11-dir=${LOCALBASE} \ --with-tcl-include=${LOCALBASE}/include/tcl${TK_VERSION} \ --with-tk-include=${LOCALBASE}/include/tk${TK_VERSION} .if defined(WITH_TCLTK_JP) diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile index b15847397981..7a0fdb74c58d 100644 --- a/x11-toolkits/scx/Makefile +++ b/x11-toolkits/scx/Makefile @@ -26,7 +26,7 @@ EXPIRATION_DATE= 2007-10-28 PLIST_SUB= TARGET=${MACHINE_ARCH}-portbld-freebsd${OSREL} post-patch: - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile index ee1f48d3ea95..a9432ef476a6 100644 --- a/x11-toolkits/slingshot/Makefile +++ b/x11-toolkits/slingshot/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview WRKSRC= ${WRKDIR}/sspkg2.1 USE_LDCONFIG= yes USE_GMAKE= yes -MAKE_ENV= OPENWINHOME=${X11BASE} +MAKE_ENV= OPENWINHOME=${LOCALBASE} post-install: .if !defined(NOPORTDOCS) diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index aeccb78bd7b5..d3ec517de8d0 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= QTDIR="${QT_PREFIX}" -CONFIGURE_ARGS= --with-pthread=yes --with-coin=${X11BASE} +CONFIGURE_ARGS= --with-pthread=yes --with-coin=${LOCALBASE} USE_LDCONFIG= yes MAN1= soqt-config.1 diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh index 6a5a8a47d4b4..ab957afbc30b 100644 --- a/x11-toolkits/swt-devel/files/patch-build.sh +++ b/x11-toolkits/swt-devel/files/patch-build.sh @@ -10,7 +10,7 @@ export SWT_PTR_CFLAGS if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 -+ XLIB64=-L${X11BASE}/lib64 ++ XLIB64=-L${LOCALBASE}/lib64 export XLIB64 fi fi diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak index e8e5ada9c555..290378a0ad82 100644 --- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak @@ -14,7 +14,7 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -23,7 +23,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -31,7 +31,7 @@ -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh index 6a5a8a47d4b4..ab957afbc30b 100644 --- a/x11-toolkits/swt/files/patch-build.sh +++ b/x11-toolkits/swt/files/patch-build.sh @@ -10,7 +10,7 @@ export SWT_PTR_CFLAGS if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 -+ XLIB64=-L${X11BASE}/lib64 ++ XLIB64=-L${LOCALBASE}/lib64 export XLIB64 fi fi diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak index 4c61c9940da6..5c371d69a986 100644 --- a/x11-toolkits/swt/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt/files/patch-make_freebsd.mak @@ -14,7 +14,7 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc @@ -23,7 +23,7 @@ GLXCFLAGS = -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS @@ -31,7 +31,7 @@ -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile index e8b394fd5ac7..56f66f24da99 100644 --- a/x11-toolkits/swt31/Makefile +++ b/x11-toolkits/swt31/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes USE_ZIP= yes MAKEFILE= make_freebsd.mak -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= BUILD=${SWT_VERSION} PLIST_FILES= %%JAVAJARDIR%%/swt.jar \ lib/libswt-atk-gtk-%%BUILD%%.so \ diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh index 9a0767cf0f7c..2a9b1860949e 100644 --- a/x11-toolkits/swt31/files/patch-build.sh +++ b/x11-toolkits/swt31/files/patch-build.sh @@ -8,7 +8,7 @@ + CC=%%CC%% + CXX=%%CXX%% + LD=%%CC%% -+ XTEST_LIB_PATH=$X11BASE/lib ++ XTEST_LIB_PATH=$LOCALBASE/lib + GECKO_INCLUDES="`${GECKO_CONFIG} --cflags gtkmozembed` -I${LOCALBASE}/include/nspr" + GECKO_LIBS="`${GECKO_CONFIG} --libs gtkmozembed` -L${LOCALBASE}/lib" + case $MODEL in diff --git a/x11-toolkits/swt31/files/patch-make_freebsd.mak b/x11-toolkits/swt31/files/patch-make_freebsd.mak index 37a506210299..bb76702289ed 100644 --- a/x11-toolkits/swt31/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt31/files/patch-make_freebsd.mak @@ -42,7 +42,7 @@ - -fpic \ + -I$(JAVA_HOME)/include/freebsd \ + -fpic -fPIC \ -+ -I$(X11BASE)/include \ ++ -I$(LOCALBASE)/include \ ${SWT_PTR_CFLAGS} -LIBS = -shared -fpic -s +LIBS = -shared -fpic -fPIC -s diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile index 18dbfa4a5a2c..580ab9f1fa55 100644 --- a/x11-toolkits/tile/Makefile +++ b/x11-toolkits/tile/Makefile @@ -19,7 +19,6 @@ USE_TK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --exec-prefix=${PREFIX} --enable-shared CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}" TCL_INCLUDES= -I${LOCALBASE}/include/tcl${TK_VER} -I${LOCALBASE}/include/tcl${TK_VER}/generic diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile index 41cbe7f48053..4295e2abb1df 100644 --- a/x11-toolkits/tix/Makefile +++ b/x11-toolkits/tix/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TCL84_PORT}:build \ LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 WRKSRC= ${WRKDIR}/${DISTNAME}/unix/tk8.4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --enable-sam \ --with-tclconfig="${PREFIX}/lib/tcl8.4" \ diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa index 16f5af159508..e2a77c4365f0 100644 --- a/x11-toolkits/tix/files/patch-aa +++ b/x11-toolkits/tix/files/patch-aa @@ -22,7 +22,7 @@ - eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" - TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" + eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1" -+ TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${X11BASE}/lib -lX11 -ltk84" ++ TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${LOCALBASE}/lib -lX11 -ltk84" # The Tcl SAM library # diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile index dec3bd4a45ef..da82dc3aefbe 100644 --- a/x11-toolkits/tk80/Makefile +++ b/x11-toolkits/tk80/Makefile @@ -290,8 +290,7 @@ post-configure: pre-build: @cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \ - SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ - X11BASE="${X11BASE}" + SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} post-install: ${LN} -sf ${TK_LIB_FILE} ${PREFIX}/lib/${TK_LIB} diff --git a/x11-toolkits/tk80/files/Makefile.lib b/x11-toolkits/tk80/files/Makefile.lib index 866a2d47e7e1..ae5a1f320b1d 100644 --- a/x11-toolkits/tk80/files/Makefile.lib +++ b/x11-toolkits/tk80/files/Makefile.lib @@ -1,7 +1,7 @@ NOPROFILE= yes LIB= tk80 TK_LIBRARY= ${PREFIX}/lib/tk80 -CFLAGS+= -I. -I./../generic -I../bitmaps -I$(X11BASE)/include \ +CFLAGS+= -I. -I./../generic -I../bitmaps -I$(LOCALBASE)/include \ -I${PREFIX}/include/tcl8.0/generic \ -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DSTDC_HEADERS=1 \ -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 \ diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile index db09c415c75b..7427b86055cd 100644 --- a/x11-toolkits/tkdnd/Makefile +++ b/x11-toolkits/tkdnd/Makefile @@ -21,7 +21,6 @@ USE_TK= yes USE_XORG= x11 xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-tclinclude=${TCL_INCLUDEDIR} --with-tkinclude=${TK_INCLUDEDIR} --enable-shared CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile index 15c2aaad9b61..b468aac600d3 100644 --- a/x11-toolkits/tktray/Makefile +++ b/x11-toolkits/tktray/Makefile @@ -19,7 +19,6 @@ USE_TK= yes USE_XORG= x11 xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-tkinclude=${TK_INCLUDEDIR} --enable-shared CPPFLAGS= -I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile index 02fea821a3fe..cd92e6adda19 100644 --- a/x11-toolkits/tktreectrl/Makefile +++ b/x11-toolkits/tktreectrl/Makefile @@ -18,7 +18,6 @@ USE_TK= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --exec-prefix=${PREFIX} --enable-shared CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}" TCL_INCLUDES= -I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic diff --git a/x11-toolkits/v/files/patch-configs-ConfigX.mk b/x11-toolkits/v/files/patch-configs-ConfigX.mk index 6dceb83a2a24..2f2ccadbe963 100644 --- a/x11-toolkits/v/files/patch-configs-ConfigX.mk +++ b/x11-toolkits/v/files/patch-configs-ConfigX.mk @@ -39,8 +39,8 @@ -INCDIR += -I/usr/$(X11RV)/include -LIBDIR += -L/usr/$(X11RV)/lib -LIBS += -lV -lXmu -lXt -lXext -lX11 -lxm -+INCDIR += -I$(X11BASE)/include -+LIBDIR += -L$(X11BASE)/lib ++INCDIR += -I$(LOCALBASE)/include ++LIBDIR += -L$(LOCALBASE)/lib +LIBS += -lXmu -lXt -lXext -lX11 TARZ = RANLIB = ranlib diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile index 8ca82b1205ca..368f8ac41996 100644 --- a/x11-toolkits/viewkit/Makefile +++ b/x11-toolkits/viewkit/Makefile @@ -7,7 +7,7 @@ PORTNAME= viewkit PORTVERSION= 0.00 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.hungry.com/pub/hungry/viewkit/ \ ${MASTER_SITE_LOCAL} @@ -19,7 +19,6 @@ COMMENT= ViewKit workalike from Hungry Programmers USE_AUTOTOOLS= autoconf:261:env MOTIFPACKAGE?= open-motif -USE_X_PREFIX= yes USE_MOTIF= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-${MOTIFPACKAGE} diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile index 8acfedd088a9..8c0e4a7690ab 100644 --- a/x11-toolkits/viewklass/Makefile +++ b/x11-toolkits/viewklass/Makefile @@ -8,18 +8,16 @@ PORTNAME= viewklass PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ViewKlass-${PORTVERSION} MAINTAINER= araujo@FreeBSD.org COMMENT= C++ Framework for Motif -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -USE_X_PREFIX= yes USE_MOTIF= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 8c18795ef389..e6b7129e9828 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -8,7 +8,7 @@ PORTNAME= vte PORTVERSION= 0.16.13 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,7 +23,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build -USE_XLIB= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile index 09c448a1e9fd..fbb6a4358cc9 100644 --- a/x11-toolkits/wmapp/Makefile +++ b/x11-toolkits/wmapp/Makefile @@ -17,7 +17,7 @@ COMMENT= A DockApp Graphics Library USE_XORG= x11 xpm USE_GMAKE= yes -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= # empty PLIST_FILES= lib/libwmapp.a diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index c464c493b892..d6a0e4b53a03 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,11 +7,10 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 15 +PORTREVISION?= 16 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows DISTNAME= wxGTK-${PORTVERSION} MAINTAINER?= fjoe@FreeBSD.org @@ -22,8 +21,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes @@ -38,12 +37,10 @@ CONFIGURE_ARGS= --with-libpng=sys \ --includedir=${PREFIX}/include/wx-2.4 CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ -I${LOCALBASE}/include \ - -I${X11BASE}/include \ ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ - -L${X11BASE}/lib \ ${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 1c434ffa9fc9..b6e1a5568fbb 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 @@ -38,13 +38,11 @@ CONFIGURE_ARGS= --with-libpng=sys\ --with-mspack\ --with-gtk\ --disable-backtrace -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv \ - -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -liconv" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist @@ -56,7 +54,7 @@ CONFLICTS= wxgtk2-contrib-devel-2.5.2* .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -72,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.6 -RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 7dd6aaae3bc4..f21d7dc8ff29 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.8.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 gconf2 @@ -44,7 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 @@ -54,7 +54,7 @@ PORTREVISION= 0 .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -70,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.8 -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index 7dd6aaae3bc4..f21d7dc8ff29 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -7,9 +7,9 @@ PORTNAME= wx PORTVERSION= 2.8.7 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows +MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} DISTNAME= wxGTK-${PORTVERSION:rc1=-rc1} @@ -23,8 +23,8 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ mspack.1:${PORTSDIR}/archivers/libmspack USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes +USE_XORG= x11 sm xxf86vm xinerama +USE_GL= glu USE_GMAKE= yes USE_ICONV= yes USE_GNOME= gtk20 gconf2 @@ -44,7 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\ PTHREAD_LIBS="${PTHREAD_LIBS}"\ - X11BASE="${X11BASE}" + X11BASE="${LOCALBASE}" PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 @@ -54,7 +54,7 @@ PORTREVISION= 0 .endif .if ${WXGTK_FLAVOR} != "gtk2-common" -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common .endif .if ${WXGTK_FLAVOR:M*-common} != "" @@ -70,7 +70,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" USE_WX= 2.8 -RUN_DEPENDS= ${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common +RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common .if ${WXGTK_FLAVOR:M*-unicode*} != "" WX_UNICODE= yes diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile index 32a248f96452..8ea1b34ce0e1 100644 --- a/x11-toolkits/xclasses/Makefile +++ b/x11-toolkits/xclasses/Makefile @@ -9,8 +9,7 @@ PORTNAME= xclasses PORTVERSION= 1.4.0 PORTREVISION= 2 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xcmail +MASTER_SITES= SF/xcmail DISTNAME= Xclasses-public-${PORTVERSION}.src MAINTAINER= ports@FreeBSD.org @@ -33,7 +32,7 @@ pre-configure: @${PERL} -pi \ -e "s|%%CXX%%|${CXX}|g;" \ -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g;" \ - -e "s|%%X11BASE%%|${X11BASE}|g;" ${WRKSRC}/${file} + -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/${file} .endfor ${REINPLACE_CMD} -e 's|\([:alnum:]\)\\$$|\1 \\|' ${WRKSRC}/Makefile diff --git a/x11-toolkits/xclasses/files/patch-ac b/x11-toolkits/xclasses/files/patch-ac index e1f41f34ce5f..2da0aba1c85b 100644 --- a/x11-toolkits/xclasses/files/patch-ac +++ b/x11-toolkits/xclasses/files/patch-ac @@ -7,9 +7,9 @@ - INCLUDESDIR=${XCLASSESINCLUDE:-"/usr/local/include"} - LIBSDIR=${XCLASSESLIB:-"/usr/local/lib"} - CONFIGSDIR=${XCLASSESCONFIG:-"/usr/lib/X11/Xclasses"} -+ INCLUDESDIR=%%X11BASE%%/include/ -+ LIBSDIR=%%X11BASE%%/lib/ -+ CONFIGSDIR=%%X11BASE%%/share/Xclasses/ ++ INCLUDESDIR=%%LOCALBASE%%/include/ ++ LIBSDIR=%%LOCALBASE%%/lib/ ++ CONFIGSDIR=%%LOCALBASE%%/share/Xclasses/ ROOTID=0 if [ "$2" != "quit" ]; then @@ -38,7 +38,7 @@ # look for installed XPM lib MAKEXPM="y" - for N in /usr/include/X11 /usr/local/include/X11 -+ for N in %%X11BASE%%/include/X11/ ++ for N in %%LOCALBASE%%/include/X11/ do if [ -f "$N/xpm.h" ]; then MAKEXPM="n" @@ -47,7 +47,7 @@ # look for shapes - if [ -f "/usr/include/X11/extensions/shape.h" ]; then -+ if [ -f "%%X11BASE%%/include/X11/extensions/shape.h" ]; then ++ if [ -f "%%LOCALBASE%%/include/X11/extensions/shape.h" ]; then USESHAPE="y" else USESHAPE="n" diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile index 1bc7c2480e3e..a3bf1b9b2414 100644 --- a/x11-toolkits/xforms/Makefile +++ b/x11-toolkits/xforms/Makefile @@ -32,18 +32,18 @@ PATCHFILES= xforms-1.0-i18n_7.patch PATCH_DIST_STRIP= -p1 .endif -USE_XPM= yes +USE_XORG= xpm USE_GL= gl USE_IMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= fdesign.1 fd2ps.1 post-patch: ${REINPLACE_CMD} -e 's|-O4||' ${WRKSRC}/Imakefile -.if defined(X11BASE) -. if ${X11BASE} != "/usr/X11R6" - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ +.if defined(LOCALBASE) +. if ${LOCALBASE} != "/usr/X11R6" + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/image/rgb_db.c . endif .endif diff --git a/x11-toolkits/xg/files/patch-aa b/x11-toolkits/xg/files/patch-aa index 0f1e8f1841a4..30390f1c11a0 100644 --- a/x11-toolkits/xg/files/patch-aa +++ b/x11-toolkits/xg/files/patch-aa @@ -6,7 +6,7 @@ # -MOTIF_INC = -CFLAGS = "-DUSE_XM_MWMUTIL_H -DUSE_XGPM -I../include ${MOTIF_INC}" -+MOTIF_INC = -I${X11BASE}/include -I${X11BASE}/include/X11 ++MOTIF_INC = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 +CFLAGS += -DUSE_XM_MWMUTIL_H -DUSE_XGPM -DV_USE_TM_ZONE -I../include ${MOTIF_INC} # diff --git a/x11-toolkits/xmhtml/files/patch-aa b/x11-toolkits/xmhtml/files/patch-aa index 88f171a35abf..3339cbd191d8 100644 --- a/x11-toolkits/xmhtml/files/patch-aa +++ b/x11-toolkits/xmhtml/files/patch-aa @@ -119,10 +119,10 @@ # Platform specific includes ifeq ($(PLATFORM),Motif) -! PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include +! PLATFORMINC=-I../../include/XmHTML -I${LOCALBASE}/include else ifeq ($(PLATFORM),gtk) -! PLATFORMINC=-I../../include/gtk-xmhtml -I${X11BASE}/include +! PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include endif endif @@ -142,7 +142,7 @@ # Motif version (default) ifeq ($(PLATFORM),Motif) -! LIBDIR = -L${X11BASE}/lib +! LIBDIR = -L${LOCALBASE}/lib # This is what is required under Linux (Motif 2.0.1). # Your mileage may vary. ! LIBS = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index 74e07751d8f9..85efa7bd6fe6 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -7,7 +7,7 @@ PORTNAME= xview-clients PORTVERSION= 3.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.efd.lth.se/pub/X11/ \ ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \ @@ -23,7 +23,6 @@ PATCH_DEPENDS= ${NONEXISTENT}:${.CURDIR}/../xview:patch LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview USE_IMAKE= yes -USE_X_PREFIX= yes WRKSRC= ${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME} ALL_TARGET= Clients diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile index 279a204b7bc8..c984dd223cd3 100644 --- a/x11-toolkits/xview/Makefile +++ b/x11-toolkits/xview/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ REINPLACE_ARGS= -i "" USE_IMAKE= yes USE_LDCONFIG= yes -IMAKEINCLUDE= "-I${X11BASE}/lib/X11/config -I${WRKSRC}/config" +IMAKEINCLUDE= "-I${LOCALBASE}/lib/X11/config -I${WRKSRC}/config" MAKE_ENV+= IMAKEINCLUDE=${IMAKEINCLUDE} ALL_TARGET= World SUB_FILES= pkg-message @@ -41,7 +41,7 @@ pre-configure: ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl - @${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \ + @${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ ${X11BASE2FIX:C|^|${WRKSRC}/|} |