diff options
Diffstat (limited to 'x11')
163 files changed, 390 insertions, 419 deletions
diff --git a/x11/9box/Makefile b/x11/9box/Makefile index 6e97349b015b..7374d81e40b2 100644 --- a/x11/9box/Makefile +++ b/x11/9box/Makefile @@ -7,7 +7,7 @@ PORTNAME= 9box PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= thierry @@ -16,15 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 9box can "pack" windows inside itself PLIST_FILES= bin/9box -USE_XLIB= yes -USE_X_PREFIX= yes USE_GMAKE= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xt BUILD_WRKSRC= ${WRKSRC}/src post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g; \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%CC%%|${CC}|g' \ ${WRKSRC}/src/Makefile diff --git a/x11/9box/files/patch-src::Makefile b/x11/9box/files/patch-src::Makefile index 68e2c34d4905..654ee9c50f60 100644 --- a/x11/9box/files/patch-src::Makefile +++ b/x11/9box/files/patch-src::Makefile @@ -2,8 +2,8 @@ +++ src/Makefile Wed Jul 23 21:35:39 2003 @@ -1,10 +1,14 @@ +CC= %%CC%% -+CFLAGS+= -g -I. -I%%X11BASE%%/include -+LIBS+= -L%%X11BASE%%/lib -lX11 ++CFLAGS+= -g -I. -I%%LOCALBASE%%/include ++LIBS+= -L%%LOCALBASE%%/lib -lX11 + all: 9box diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile index df8fafa24b29..46c6cf6eebb4 100644 --- a/x11/9menu/Makefile +++ b/x11/9menu/Makefile @@ -32,6 +32,6 @@ MANCOMPRESSED= yes do-build: cd ${WRKSRC} && \ - ${CC} ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib -lX11 -o 9menu 9menu.c + ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -o 9menu 9menu.c .include <bsd.port.mk> diff --git a/x11/9term/files/patch-ad b/x11/9term/files/patch-ad index 4a9f0f3cc3f4..46e5a7b8bf66 100644 --- a/x11/9term/files/patch-ad +++ b/x11/9term/files/patch-ad @@ -20,7 +20,7 @@ -CFLAGS=-g $(OS) $(INCLUDES) -fno-builtin -D_LIBXG_EXTENSION -LDFLAGS=-g -R/usr/openwin/lib -L/usr/openwin/lib -R/usr/ucblib -L/usr/ucblib -CC=gcc -+INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I${X11BASE}/include ++INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I${LOCALBASE}/include +CFLAGS+= $(OS) $(INCLUDES) +LDFLAGS= +CC?=gcc @@ -31,8 +31,8 @@ -XLIBS=-lXt -lX11 - +LIBS=../libtext/libtext.a $(SAMPATH)/libframe/libframe.a $(SAMPATH)/libXg/libXg.a -+XLIBS= -lXt -lX11 -L${X11BASE}/lib -+XLIBS+=-Wl,-rpath,$(X11BASE)/lib ++XLIBS= -lXt -lX11 -L${LOCALBASE}/lib ++XLIBS+=-Wl,-rpath,$(LOCALBASE)/lib OBJECTS=9term.o command.o display.o pty.o $(TARGET): $(OBJECTS) diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile index e1fa1647fd84..2cbf41a4b118 100644 --- a/x11/accessx/Makefile +++ b/x11/accessx/Makefile @@ -25,8 +25,8 @@ PLIST_FILES= bin/ax bin/accessx post-patch: ${REINPLACE_CMD} \ -e "s@/usr/local@${PREFIX}@" \ - -e "s@/usr/X11R6/lib@${X11BASE}/lib@" \ - -e "s@g\+\+@${CXX} ${CXXFLAGS} -I${X11BASE}/include@g" \ + -e "s@/usr/X11R6/lib@${LOCALBASE}/lib@" \ + -e "s@g\+\+@${CXX} ${CXXFLAGS} -I${LOCALBASE}/include@g" \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s@wish -f@${WISH} -f@g" ${WRKSRC}/accessx diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile index 252e0e60a91b..a25eee72d760 100644 --- a/x11/alltray/Makefile +++ b/x11/alltray/Makefile @@ -9,16 +9,15 @@ PORTNAME= alltray PORTVERSION= 0.69 PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= acm@FreeBSD.org COMMENT= Dock any application with no native tray icon USE_GNOME= gtk20 GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib" +USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GCC= 3.4+ MAN1= alltray.1 diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile index 31a0f5f7d1d3..ed7db46c86f4 100644 --- a/x11/apwal/Makefile +++ b/x11/apwal/Makefile @@ -7,7 +7,7 @@ PORTNAME= apwal PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://apwal.free.fr/download/ @@ -15,7 +15,6 @@ MAINTAINER= vs@FreeBSD.org COMMENT= Simple and powerful application launcher USE_GNOME= gtk20 libxml2 -USE_X_PREFIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}/src diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index 744be93ca492..8439e4ff3632 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -9,8 +9,7 @@ PORTNAME= aterm PORTVERSION= 1.0.1 PORTREVISION= 1 CATEGORIES+= x11 # `+=' is for slave ports -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= mich@FreeBSD.org COMMENT= A color vt102 terminal emulator with transparency support @@ -22,7 +21,7 @@ CONFIGURE_ARGS+= --enable-transparency \ --enable-fading --enable-utmp --enable-wtmp \ --without-afterstep-config -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_BACKGROUND_IMAGE) LIB_DEPENDS+= AfterImage.0:${PORTSDIR}/graphics/libafterimage diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile index 1e00081f5b26..d4a8d0208bcd 100644 --- a/x11/bbrun/Makefile +++ b/x11/bbrun/Makefile @@ -7,7 +7,7 @@ PORTNAME= bbrun PORTVERSION= 1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/ @@ -16,6 +16,7 @@ COMMENT= A Run box for Blackbox WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun +USE_XORG= xpm USE_GNOME= gtk20 USE_GMAKE= yes MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile index e5733a7ff1aa..7040172a6f27 100644 --- a/x11/bbrun/files/patch-Makefile +++ b/x11/bbrun/files/patch-Makefile @@ -5,7 +5,7 @@ -LIBDIR = -L/usr/lib -L/usr/X11R6/lib -LIBS = -lXpm `pkg-config --libs gtk+-2.0` -CFLAGS = `pkg-config --cflags gtk+-2.0` -+LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib +LIBS = -lXpm `pkg-config --libs gtk+-2.0` ${LDFLAGS} +CFLAGS += `pkg-config --cflags gtk+-2.0` diff --git a/x11/blast/Makefile b/x11/blast/Makefile index 925cf1a0baa5..b9a86699d710 100644 --- a/x11/blast/Makefile +++ b/x11/blast/Makefile @@ -22,7 +22,7 @@ MAN1= blast.1 PLIST_FILES= bin/blast do-build: - ${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${X11BASE}/include -L${X11BASE}/lib -lX11 -lXext -o ${WRKSRC}/blast + ${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -lXext -o ${WRKSRC}/blast do-install: ${INSTALL_PROGRAM} ${WRKSRC}/blast ${PREFIX}/bin/blast diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index d6be0fa327db..b2717a657c8a 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -18,7 +18,7 @@ COMMENT= Quick start up utility for applications on an X display USE_IMAKE= yes USE_PERL5_BUILD=yes -USE_XPM= yes +USE_XORG= xpm MAN1= bricons.1 .include <bsd.port.pre.mk> diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile index c5d91513b4f8..821de0548824 100644 --- a/x11/brightside/Makefile +++ b/x11/brightside/Makefile @@ -7,7 +7,7 @@ PORTNAME= brightside PORTVERSION= 1.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://files.catmur.co.uk/brightside/ @@ -15,7 +15,7 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= A tool to add reactivity to the edges and corners of the GNOME desktop USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 xt USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gnomehack libwnck libgnomeui diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile index 16cd71274730..d38b5a5980a0 100644 --- a/x11/buttonbox/Makefile +++ b/x11/buttonbox/Makefile @@ -23,8 +23,8 @@ PLIST= ${WRKDIR}/pkg-plist USE_XORG= x11 xext do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${X11BASE}/lib \ - -I${X11BASE}/include -lX11 -lXext button.c configuration.c \ + cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${LOCALBASE}/lib \ + -I${LOCALBASE}/include -lX11 -lXext button.c configuration.c \ colour.c dispatcher.c main.c pre-install: @@ -39,8 +39,8 @@ pre-install: .endif do-install: - ${INSTALL_DATA} ${WRKSRC}/ButtonBox.ad ${X11BASE}/lib/X11/app-defaults/ - ${INSTALL_PROGRAM} ${WRKSRC}/buttonbox ${X11BASE}/bin/ + ${INSTALL_DATA} ${WRKSRC}/ButtonBox.ad ${LOCALBASE}/lib/X11/app-defaults/ + ${INSTALL_PROGRAM} ${WRKSRC}/buttonbox ${LOCALBASE}/bin/ .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/${DOCDIR} for i in ${DOCS}; \ diff --git a/x11/cnslock/files/patch-Makefile b/x11/cnslock/files/patch-Makefile index 3be3a2a6dd1c..25a254705210 100644 --- a/x11/cnslock/files/patch-Makefile +++ b/x11/cnslock/files/patch-Makefile @@ -19,7 +19,7 @@ kleds.o: kleds.c include/kleds.h include/defines.h - $(CC) -Wall -I/usr/X11R6/include -c kleds.c -o kleds.o -+ $(CC) -Wall -I$(X11BASE)/include -c kleds.c -o kleds.o ++ $(CC) -Wall -I$(LOCALBASE)/include -c kleds.c -o kleds.o cnslock: $(OBJS) $(CC) -o cnslock $(OBJS) $(LIBS) diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile index d0bbdf5c1555..95599a5f6514 100644 --- a/x11/decurs/Makefile +++ b/x11/decurs/Makefile @@ -7,7 +7,7 @@ PORTNAME= decurs PORTVERSION= 0.55.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= http://varg.dyndns.org/psi/files/ @@ -16,7 +16,7 @@ COMMENT= A GTK+ based program that lets you edit you XFree86 mouse cursors LIB_DEPENDS= gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20 -USE_X_PREFIX= yes +USE_XORG= x11 USE_GNOME= gnometarget gtk20 GNU_CONFIGURE= yes diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile index e11e1fba7b64..fc62165f6bce 100644 --- a/x11/deskmenu/Makefile +++ b/x11/deskmenu/Makefile @@ -20,6 +20,6 @@ USE_GNOME= gtk12 USE_GMAKE= yes post-install: - ${STRIP_CMD} ${X11BASE}/bin/deskmenu + ${STRIP_CMD} ${PREFIX}/bin/deskmenu .include <bsd.port.mk> diff --git a/x11/deskmenu/files/patch-Makefile b/x11/deskmenu/files/patch-Makefile index 3f3804f39a25..573a7cf09ff9 100644 --- a/x11/deskmenu/files/patch-Makefile +++ b/x11/deskmenu/files/patch-Makefile @@ -5,7 +5,7 @@ -CFLAGS = -g -O2 -Wall `gtk-config --cflags` -XROOT = /usr/X11 +CFLAGS = -g -O2 -Wall `gtk12-config --cflags` -+XROOT = ${X11BASE} ++XROOT = ${LOCALBASE} INCLUDES = -I$(XROOT)/include -LIBS = -lX11 `gtk-config --libs` +LIBS = -lX11 `gtk12-config --libs` diff --git a/x11/dmenu/files/patch-config.mk b/x11/dmenu/files/patch-config.mk index fac9f79fda0e..b4f1c9a1cd99 100644 --- a/x11/dmenu/files/patch-config.mk +++ b/x11/dmenu/files/patch-config.mk @@ -11,8 +11,8 @@ -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib -+X11INC = $(X11BASE)/include -+X11LIB = $(X11BASE)/lib ++X11INC = $(LOCALBASE)/include ++X11LIB = $(LOCALBASE)/lib # includes and libs INCS = -I. -I/usr/include -I${X11INC} diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile index 569274e3f1e0..4206e50f4062 100644 --- a/x11/dxpc/Makefile +++ b/x11/dxpc/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE} -MAKE_ARGS= CPPFLAGS="-I. -I${X11BASE}/include" +MAKE_ARGS= CPPFLAGS="-I. -I${LOCALBASE}/include" MAN1= dxpc.1 PLIST_FILES= bin/dxpc diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile index 196d62691af2..c4648428e21d 100644 --- a/x11/ebuttons/Makefile +++ b/x11/ebuttons/Makefile @@ -24,8 +24,8 @@ WRKSRC= ${WRKDIR}/E-buttons USE_GL= gl USE_EFL= imlib2 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lepplet -lGL -lImlib2 ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lepplet -lGL -lImlib2 ${PTHREAD_LIBS} do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o E-Buttons.epplet \ diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile index 9dfd50b121d2..fde64fd064a6 100644 --- a/x11/electricsheep/Makefile +++ b/x11/electricsheep/Makefile @@ -34,8 +34,8 @@ USE_XORG= x11 xau xdmcp xext xi xrandr xv sm ice MAN1= electricsheep.1 .endif -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" LIBTOOLFILES= configure mpeg2dec/configure flam3/configure @@ -52,7 +52,7 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e \ - 's|/usr/X11R6/lib/xscreensaver/config|${X11BASE}/share/xscreensaver/config|' \ + 's|/usr/X11R6/lib/xscreensaver/config|${LOCALBASE}/share/xscreensaver/config|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ diff --git a/x11/emu/Makefile b/x11/emu/Makefile index 40801ef47941..5a9b2f80d820 100644 --- a/x11/emu/Makefile +++ b/x11/emu/Makefile @@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org COMMENT= A terminal emulator for the X Window System -BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} -RUN_DEPENDS= xrdb:${X_CLIENTS_PORT} +BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb +RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb USE_IMAKE= yes USE_DISPLAY= yes diff --git a/x11/erun/Makefile b/x11/erun/Makefile index f9237401a6b5..41087835cdc4 100644 --- a/x11/erun/Makefile +++ b/x11/erun/Makefile @@ -23,8 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GL= gl USE_EFL= imlib2 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS} do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \ diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 9a6fceab9aab..59672432e3d3 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -9,8 +9,7 @@ PORTNAME= eterm PORTVERSION= 0.9.4 PORTREVISION= 4 CATEGORIES+= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= Eterm-${PORTVERSION} MAINTAINER?= olgeni@FreeBSD.org @@ -28,7 +27,7 @@ CONFIGURE_ARGS?=--enable-trans --enable-utmp \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= MMX "With MMX instruction set" off -USE_XLIB= yes +USE_XORG= x11 xt USE_ICONV= yes USE_EFL= imlib2 diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index 9c96e26c8e4c..4a3790058257 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -8,6 +8,7 @@ PORTNAME= fast-user-switch-applet PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,8 +16,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Fast user switching applet for GNOME +USE_XORG= x11 USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk20 gnomepanel diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile index 4a8df934b84c..ad2d4c806ef4 100644 --- a/x11/fbpanel/Makefile +++ b/x11/fbpanel/Makefile @@ -7,15 +7,15 @@ PORTNAME= fbpanel PORTVERSION= 4.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@fsck.ch COMMENT= Desktop panel that includes a taskbar, pager, launchbar and more +USE_XORG= x11 xmu xpm USE_GNOME= gtk20 HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile index 9d369e28f91a..27946f35794e 100644 --- a/x11/fbsd-icons/Makefile +++ b/x11/fbsd-icons/Makefile @@ -20,7 +20,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes do-install: - ${MKDIR} ${X11BASE}/icons - ( cd ${X11BASE}/icons; ${TAR} --no-same-owner --no-same-permissions -xzf ${DISTDIR}/fbsd-icons.tar.gz ) + ${MKDIR} ${PREFIX}/icons + ( cd ${PREFIX}/icons; ${TAR} --no-same-owner --no-same-permissions -xzf ${DISTDIR}/fbsd-icons.tar.gz ) .include <bsd.port.mk> diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile index 0245b8b79ace..9603aefa77eb 100644 --- a/x11/fireflies/Makefile +++ b/x11/fireflies/Makefile @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/GL" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/GL" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \ --with-confdir=${LOCALBASE}/share/xscreensaver/config PLIST_SUB= VERSION=${PORTVERSION} diff --git a/x11/fireflies/files/patch-Make.include.in b/x11/fireflies/files/patch-Make.include.in index 9369f93aefad..059278411157 100644 --- a/x11/fireflies/files/patch-Make.include.in +++ b/x11/fireflies/files/patch-Make.include.in @@ -6,8 +6,8 @@ -CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ -LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@ -+CFLAGS = -Wall -I$(X11BASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ -+LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(X11BASE)/lib $(GL_LIBS) @LIBS@ ++CFLAGS = -Wall -I$(LOCALBASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ ++LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(LOCALBASE)/lib $(GL_LIBS) @LIBS@ OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@ PROGRAM = @PROGRAM@ diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile index 3505498d487c..7293fa1c8153 100644 --- a/x11/fluxbg/Makefile +++ b/x11/fluxbg/Makefile @@ -9,8 +9,7 @@ PORTNAME= fluxbg PORTVERSION= 0.7 PORTREVISION= 7 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Background changer for fluxbox/blackbox @@ -22,14 +21,13 @@ USE_GNOME= gnomehack gnometarget .include <bsd.port.pre.mk> -.if !exists(${LOCALBASE}/bin/fbsetbg) && \ - !exists(${X11BASE}/bin/fbsetbg) +.if !exists(${LOCALBASE}/bin/fbsetbg) RUN_DEPENDS= fbsetbg:${PORTSDIR}/x11-wm/fluxbox .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/fluxbg_conf.cc + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/fluxbg_conf.cc post-install: @${CAT} ${PKGMESSAGE} diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile index 00ae77a33076..92115f9ddfef 100644 --- a/x11/gcursor/Makefile +++ b/x11/gcursor/Makefile @@ -26,8 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ DOCS= AUTHORS COPYING ChangeLog INSTALL TODO post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c .ifndef (NOPORTDOCS) post-install: diff --git a/x11/gcursor/files/patch-src::gcursor.c b/x11/gcursor/files/patch-src::gcursor.c index 583eac0fd36d..5161e1e3b34a 100644 --- a/x11/gcursor/files/patch-src::gcursor.c +++ b/x11/gcursor/files/patch-src::gcursor.c @@ -10,7 +10,7 @@ - "/usr/local/share/icons/", - "/usr/share/icons/", + "%%LOCALBASE%%/lib/X11/icons/", -+ "%%X11BASE%%/lib/X11/icons/", ++ "%%LOCALBASE%%/lib/X11/icons/", "%s/.icons/", NULL }; diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index eb847c8bd191..58a4db01d84b 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-applets PORTVERSION= 2.22.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,7 +27,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTS USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 52d1f30f022c..8c70a9c524c8 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-libs PORTVERSION= 1.4.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-libs/1.4 @@ -21,8 +21,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_BZIP2= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= xpm ice x11 USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix esound gtk12 imlib libxml orbit diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 890725c65e56..1edd00ae1268 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-panel PORTVERSION= 2.22.1.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -25,7 +25,6 @@ LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome USE_GETTEXT= yes -USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 602fca757c63..94fd144c23e8 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-screensaver PORTVERSION= 2.22.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +20,6 @@ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile index 1e0197417784..4f5f0fd301fa 100644 --- a/x11/gnome-swallow/Makefile +++ b/x11/gnome-swallow/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnome-swallow PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= http://interreality.org/~tetron/technology/swallow/ MAINTAINER= marcus@FreeBSD.org COMMENT= Applet that swallows any X11 application into the GNOME 2 panel -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomepanel GNU_CONFIGURE= yes diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index deba7104b9bd..09e7f7578229 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-terminal PORTVERSION= 2.22.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +19,6 @@ COMMENT= Terminal component for the GNOME 2 Desktop USE_GETTEXT= yes USE_BZIP2= yes INSTALLS_OMF= yes -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils GNU_CONFIGURE= yes diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile index b1c01a737229..408d644605f9 100644 --- a/x11/gpctool/Makefile +++ b/x11/gpctool/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= gpc:${PORTSDIR}/devel/libgpc \ USE_ZIP= yes USE_GL= yes PLIST_FILES= bin/gpctool -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_CDROM= Can't be used for profit without permission MAKEFILE= ${FILESDIR}/BSDmakefile diff --git a/x11/gpctool/files/BSDmakefile b/x11/gpctool/files/BSDmakefile index 42365dfae84f..957862277916 100644 --- a/x11/gpctool/files/BSDmakefile +++ b/x11/gpctool/files/BSDmakefile @@ -6,9 +6,9 @@ SRCS= gpctool.c main.c callbacks.c graphics.c psdump.c BINDIR= ${PREFIX}/bin WARNS?= 2 -CFLAGS+= -I${X11BASE}/include/X11 -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${X11BASE}/lib -lformsGL -lGLU +LDFLAGS+= -L${LOCALBASE}/lib -lformsGL -lGLU LDFLAGS+= -L${LOCALBASE}/lib -lgpc -lm .include <bsd.prog.mk> diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile index 6c0e09fe2b1c..8e2c852bbee5 100644 --- a/x11/gsynaptics/Makefile +++ b/x11/gsynaptics/Makefile @@ -33,6 +33,6 @@ post-install: .include <bsd.port.pre.mk> -RUN_DEPENDS+= ${X11BASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics +RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics .include <bsd.port.post.mk> diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile index cf33fd9aad22..0bf342e50de6 100644 --- a/x11/gtk-themepreview/Makefile +++ b/x11/gtk-themepreview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk-themepreview PORTVERSION= 2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_LOCAL} # http://www.users.monornet.hu/linux/files/ MASTER_SITE_SUBDIR= danfe @@ -17,7 +17,6 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= A small application for preview your theme widgets in one small window GNU_CONFIGURE= yes -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_AUTOTOOLS= automake:19:env diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile index 3201461099e6..e4e5bd72a298 100644 --- a/x11/gtkchtheme/Makefile +++ b/x11/gtkchtheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkchtheme PORTVERSION= 0.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/ DISTNAME= gtk-chtheme-${PORTVERSION} @@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK2 theme changer USE_BZIP2= yes -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gtk20 diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kde4-baseapps/files/pkg-message.in b/x11/kde4-baseapps/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kde4-baseapps/files/pkg-message.in +++ b/x11/kde4-baseapps/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kde4-runtime/files/pkg-message.in b/x11/kde4-runtime/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kde4-runtime/files/pkg-message.in +++ b/x11/kde4-runtime/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde4-workspace/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kde4-workspace/files/pkg-message.in +++ b/x11/kde4-workspace/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase3/files/pkg-message.in b/x11/kdebase3/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kdebase3/files/pkg-message.in +++ b/x11/kdebase3/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4-runtime/files/pkg-message.in b/x11/kdebase4-runtime/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kdebase4-runtime/files/pkg-message.in +++ b/x11/kdebase4-runtime/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4-workspace/files/pkg-message.in b/x11/kdebase4-workspace/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kdebase4-workspace/files/pkg-message.in +++ b/x11/kdebase4-workspace/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 975b37108866..c07439e0b9a8 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb-0.1:${PORTSDIR}/devel/libusb @@ -33,7 +33,7 @@ USE_OPENSSL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XPM= yes +USE_XORG= xpm SUB_FILES= kdm pkg-deinstall pkg-install pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install @@ -45,8 +45,8 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp CONFIGURE_ARGS+=--without-java \ - --with-qt-dir=${X11BASE} \ - --with-xdmdir=${X11BASE}/lib/X11/xdm \ + --with-qt-dir=${LOCALBASE} \ + --with-xdmdir=${LOCALBASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ diff --git a/x11/kdebase4/files/pkg-message.in b/x11/kdebase4/files/pkg-message.in index 34663a8e2907..dfc3f83e715e 100644 --- a/x11/kdebase4/files/pkg-message.in +++ b/x11/kdebase4/files/pkg-message.in @@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts $ xset fp rehash or by adding it to your X-server configuration file (usually -/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and +/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and restarting the X-server. You also have to make the new path known to fontconfig by @@ -15,6 +15,6 @@ adding a <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running +%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running fc-cache -f (as root if you edited local.conf) afterwards. diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c08c1a99290a..49baf9dcdcee 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -62,14 +62,14 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" -FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir +FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index c08c1a99290a..49baf9dcdcee 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -62,14 +62,14 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ + --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \ --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" -FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir +FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile index 55cfa13164ac..4d4008098153 100644 --- a/x11/keylaunch/Makefile +++ b/x11/keylaunch/Makefile @@ -22,7 +22,7 @@ USE_XORG= x11 PKGMESSAGE= ${WRKSRC}/pkg-message post-patch: - @${PERL} -pi -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/Makefile + @${PERL} -pi -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/example_rc ${EXAMPLESDIR}/keylaunch.rc post-install: - @${SED} -e 's;/usr/X11R6;${PREFIX};g' < ${FILESDIR}/pkg-message.in > \ + @${SED} -e 's;/usr/X11R6;${LOCALBASE};g' < ${FILESDIR}/pkg-message.in > \ ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} diff --git a/x11/keylaunch/files/patch-Makefile b/x11/keylaunch/files/patch-Makefile index adbf494bb8dd..eafcf1b6863e 100644 --- a/x11/keylaunch/files/patch-Makefile +++ b/x11/keylaunch/files/patch-Makefile @@ -4,7 +4,7 @@ -CC = gcc -CFLAGS = -g -O2 -Wall -XROOT = /usr/X11 -+XROOT = %%X11BASE%% ++XROOT = %%LOCALBASE%% INCLUDES = -I$(XROOT)/include LIBS = -lX11 LDPATH = -L$(XROOT)/lib diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile index 97ed7b15e1f0..7d87bc7125ed 100644 --- a/x11/kxgenerator/Makefile +++ b/x11/kxgenerator/Makefile @@ -23,7 +23,7 @@ INSTALLS_ICONS= yes pre-configure: .for i in properties.h main.cpp - @${REINPLACE_CMD} -e "s:/usr/lib/xorg:${X11BASE}/lib:g" \ + @${REINPLACE_CMD} -e "s:/usr/lib/xorg:${LOCALBASE}/lib:g" \ ${WRKSRC}/src/${i} .endfor diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index bb5baf630641..03cfadbd3231 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib .include <bsd.port.pre.mk> .if defined(WITH_XCB) -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb RUN_DEPENDS+= ${BUILD_DEPENDS} CONFIGURE_ARGS+= --with-xcb=yes PLIST_SUB+= XCB="" diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile index 132bdd2884e5..c7685dd4f59b 100644 --- a/x11/libXtrans/Makefile +++ b/x11/libXtrans/Makefile @@ -15,7 +15,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Network API translation layer for X applications and libraries USE_BZIP2= yes -PREFIX?= ${X11BASE} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GMAKE= yes diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile index c0e075afbd67..885e902479fe 100644 --- a/x11/libcapplet/Makefile +++ b/x11/libcapplet/Makefile @@ -19,7 +19,7 @@ COMMENT= A library for writing custom applets for GNOME Control Center USE_BZIP2= yes USE_GNOME= gnomelibs USE_LDCONFIG= yes -MAKE_ENV= X11BASE="${LOCALBASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}" .include <bsd.port.pre.mk> diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile index 72fec2549c4f..e3f3e1d7fdcb 100644 --- a/x11/libcapplet/files/patch-Makefile +++ b/x11/libcapplet/files/patch-Makefile @@ -1,19 +1,20 @@ ---- Makefile.orig Wed Jul 10 08:32:05 2002 -+++ Makefile Wed Oct 4 15:35:57 2006 +--- Makefile.orig 2002-07-10 14:32:05.000000000 +0200 ++++ Makefile 2008-04-12 14:10:37.000000000 +0200 @@ -7,14 +7,14 @@ SRCS= capplet-widget-libs.c capplet-widget.c capplet-widget-libs.h \ capplet-widget.h control-center-common.c control-center-skels.c \ control-center-stubs.c control-center.h -CFLAGS+=-I. -I${X11BASE}/include -I${X11BASE}/include/gtk12 \ - -I${X11BASE}/include/gnome-1.0 -I${LOCALBASE}/include \ -+CFLAGS+=-I. -I${X11BASE}/include -I${LOCALBASE}/include/gtk12 \ ++CFLAGS+=-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/gtk12 \ + -I${LOCALBASE}/include/gnome-1.0 -I${LOCALBASE}/include \ -I${LOCALBASE}/include/glib12 -I${LOCALBASE}/include/orbit-1.0 - LDADD+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \ +-LDADD+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \ - -lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \ - -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \ - -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl \ - -lesd -lgnugetopt -laudiofile ++LDADD+= -L${LOCALBASE}/lib -lORBitCosNaming -lORBit -lIIOP \ + -lORBitutil -lglib-12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \ + -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 \ + -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \ diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in index ee73029fd555..b146abff2089 100644 --- a/x11/libcapplet/files/patch-cappletConf.sh.in +++ b/x11/libcapplet/files/patch-cappletConf.sh.in @@ -1,9 +1,10 @@ ---- cappletConf.sh.in.orig Wed Jul 10 08:42:31 2002 -+++ cappletConf.sh.in Sat Oct 7 15:03:42 2006 +--- cappletConf.sh.in.orig 2002-07-10 14:42:31.000000000 +0200 ++++ cappletConf.sh.in 2008-04-12 14:12:31.000000000 +0200 @@ -1,4 +1,4 @@ - CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib" +-CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib" -CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba" -CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12" ++CAPPLET_LIBDIR="-Wl,-E -L%%LOCALBASE%%/lib" +CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba" -+CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12" ++CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12" MODULE_VERSION="capplet-1.4.0.5" diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index b5acfccfdeb6..cf351e3cb370 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdnd PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://leb.net/offix/ DISTNAME= dnd.${PORTVERSION} @@ -16,10 +16,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Drag and drop library -USE_XLIB= yes +USE_XORG= x11 xmu ice xaw USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/DND/DNDlib GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/" \ + LDFLAGS="-L${LOCALBASE}/lib/" post-install: .if !defined(NOPORTDOCS) diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab index 08ad036d4c93..550691b8906c 100644 --- a/x11/libdnd/files/patch-ab +++ b/x11/libdnd/files/patch-ab @@ -4,7 +4,7 @@ RANLIB = @RANLIB@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@ -+LIBS+= -Wl,-rpath,$(X11BASE)/lib ++LIBS+= -Wl,-rpath,$(LOCALBASE)/lib +SHLDFLAGS= -shared -x -soname $@ +DNDLIB= libDnd.so.1 +DNDPLUSLIB= libDnd++.so.1 diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile index a9fb6b590f43..0c706096cd40 100644 --- a/x11/libgnome-java/Makefile +++ b/x11/libgnome-java/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnome-java PORTVERSION= 2.12.7 +PORTREVISION= 1 CATEGORIES= x11 java MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 @@ -20,7 +21,6 @@ BUILD_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/ RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile index 6c64242effc7..880ea98daf87 100644 --- a/x11/libgnomemm/Makefile +++ b/x11/libgnomemm/Makefile @@ -7,10 +7,9 @@ PORTNAME= libgnomemm PORTVERSION= 2.0.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkmm +MASTER_SITES= SF/gtkmm DIST_SUBDIR= gnome2 MAINTAINER= bland@FreeBSD.org @@ -20,11 +19,10 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_AUTOTOOLS= libtool:15 -USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomehack libgnome GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 7ea6c53d4e2c..6660c199ddac 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -8,6 +8,7 @@ PORTNAME= libgnomemm PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,9 +23,8 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libgnomemm26 USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= xext USE_GMAKE= yes -USE_GCC= 3.4+ USE_GNOME= gnomehack libgnome GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile index dbe0ac3e30a6..5d155a961406 100644 --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -7,7 +7,7 @@ PORTNAME= libsx PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= libraries @@ -19,7 +19,7 @@ COMMENT= Simple X11 library LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_XORG= x11 +USE_XORG= x11 xext xmu xt ALL_TARGET= src freq do-install: diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-aa index 0183076a064c..f412ab17ba0c 100644 --- a/x11/libsx/files/patch-aa +++ b/x11/libsx/files/patch-aa @@ -14,7 +14,7 @@ # CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT # -CFLAGS = -g -D_POSIX_SOURCE -+CFLAGS += -O -D_POSIX_SOURCE -I$(X11BASE)/include ++CFLAGS += -O -D_POSIX_SOURCE -I$(LOCALBASE)/include # # if you are on a System V (like the SGI) machine, just define RANLIB @@ -34,5 +34,5 @@ #LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 -LIBS = $(LIBSX) -lXaw -lXmu -lXt -lX11 - -+LIBS = $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib -+LIBS+= -Wl,-rpath,${X11BASE}/lib ++LIBS = $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(LOCALBASE)/lib ++LIBS+= -Wl,-rpath,${LOCALBASE}/lib diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile index 4f3b35267702..d93afa68638a 100644 --- a/x11/libsynaptics/Makefile +++ b/x11/libsynaptics/Makefile @@ -16,12 +16,12 @@ MAINTAINER= markus@FreeBSD.org COMMENT= Library to access the Xorg/XFree86 Synaptics TouchPad Driver USE_BZIP2= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes USE_XORG= x11 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" post-patch: @${REINPLACE_CMD} -e 's/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/g' \ diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 060c2039e0f3..42874b5bd4af 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -8,9 +8,10 @@ PORTNAME= libxklavier PORTVERSION= 3.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gswitchit MAINTAINER= gnome@FreeBSD.org @@ -18,7 +19,7 @@ COMMENT= An utility library to make XKB stuff easier RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp -USE_XLIB= yes +USE_XORG= x11 xkbfile USE_GMAKE= yes USE_GNOME= gnometarget gnomehack libxml2 glib20 USE_LDCONFIG= yes diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile index bae9faa45884..5b60f1b85ecb 100644 --- a/x11/linux-f10-xorg-libs/Makefile +++ b/x11/linux-f10-xorg-libs/Makefile @@ -21,7 +21,7 @@ CONFLICTS= linux-XFree86-libs USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm diff --git a/x11/linux-f8-xorg-libs/Makefile b/x11/linux-f8-xorg-libs/Makefile index bae9faa45884..5b60f1b85ecb 100644 --- a/x11/linux-f8-xorg-libs/Makefile +++ b/x11/linux-f8-xorg-libs/Makefile @@ -21,7 +21,7 @@ CONFLICTS= linux-XFree86-libs USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile index bae9faa45884..5b60f1b85ecb 100644 --- a/x11/linux-xorg-libs/Makefile +++ b/x11/linux-xorg-libs/Makefile @@ -21,7 +21,7 @@ CONFLICTS= linux-XFree86-libs USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile index aa877d51d2ae..01c30c82ba89 100644 --- a/x11/lxpanel/Makefile +++ b/x11/lxpanel/Makefile @@ -7,19 +7,20 @@ PORTNAME= lxpanel PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= lxde MAINTAINER= b89605222@ntu.edu.tw COMMENT= LXPanel is a lightweight X11 desktop panel +USE_XORG= x11 xmu USE_GNOME= gtk20 gnomelibs gnomedesktop GNU_CONFIGURE= yes USE_AUTOTOOLS= automake:19 CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib" CFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" CFLAGS+= -I${WRKSRC} USE_GMAKE= yes diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile index 849979ae3373..b6bfe1fdfc65 100644 --- a/x11/metisse/Makefile +++ b/x11/metisse/Makefile @@ -17,7 +17,7 @@ COMMENT= An innovative X-based window system CONFLICTS= fvwm-1.* fvwm-2.5.* LIB_DEPENDS= Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo -RUN_DEPENDS= ${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts +RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts BROKEN= Does not compile @@ -26,7 +26,7 @@ PATCH_STRIP= -p1 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-fontdir=${X11BASE}/lib/X11/fonts +CONFIGURE_ARGS= --with-fontdir=${LOCALBASE}/lib/X11/fonts MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}" USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile index 7561e9adbb35..27b983b6eb8b 100644 --- a/x11/mrxvt-devel/Makefile +++ b/x11/mrxvt-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= mrxvt-devel PORTVERSION= 0.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF MASTER_SITE_SUBDIR= materm @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --enable-xim --enable-cjk --with-encoding=eucj .endif .if defined(WITH_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG+= xft CONFIGURE_ARGS+= --enable-xft .endif @@ -113,8 +113,8 @@ CONFIGURE_ARGS+= --with-atab-extra=${EXTRA_ATAB_HEIGHT:M[0-9]*} CONFIGURE_ARGS+= --with-tab-radius=${TAB_RADIUS:M[0-9]*} .endif -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="${LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LIBS="${LIBS} -L${LOCALBASE}/lib" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${PREFIX}/bin diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile index 18018c17f8ba..c73e21ca94bb 100644 --- a/x11/multi-aterm/Makefile +++ b/x11/multi-aterm/Makefile @@ -17,7 +17,7 @@ COMMENT= A multi terminal based on aterm USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ - --with-xpm=${X11BASE} + --with-xpm=${LOCALBASE} DOCS= AUTHORS ChangeLog INSTALL TODO MAN1= multi-aterm.1 diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile index e4213ee0714a..435a05d86d6f 100644 --- a/x11/numlockx/Makefile +++ b/x11/numlockx/Makefile @@ -21,6 +21,6 @@ USE_XORG= x11 xext PLIST_FILES= bin/numlockx # Needed for the "configure" program to find XTest and XKB header files -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" .include <bsd.port.mk> diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index fdd8a5209d04..94d37ecf94ab 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -129,7 +129,7 @@ post-patch: .SILENT pre-su-install: # XXX This port silently assumes PREFIX == X11BASE XXX @${MKDIR} ${PREFIX}/${MODULESDIR}/drivers -# xorg-server-1.4 installs its own ${X11BASE}/lib/xorg/modules/libwfb.so, +# xorg-server-1.4 installs its own ${LOCALBASE}/lib/xorg/modules/libwfb.so, # so back it up so it can be later restored similarly to what NVidia does: .if ${NVVERSION} >= 974600 @${MV} -f ${PREFIX}/${MODULESDIR}/libwfb.so \ diff --git a/x11/nvidia-driver/files/patch-lib::Makefile b/x11/nvidia-driver/files/patch-lib::Makefile index 453550ee24f3..35cd61c4f485 100644 --- a/x11/nvidia-driver/files/patch-lib::Makefile +++ b/x11/nvidia-driver/files/patch-lib::Makefile @@ -2,7 +2,7 @@ +++ lib/Makefile Wed Jun 22 19:12:16 2005 @@ -6,7 +6,7 @@ FIND_DIRS= /usr/lib \ - ${X11BASE}/lib + ${LOCALBASE}/lib -.if exists(/compat/linux) +.if exists(/compat/linux) && !defined(WITHOUT_LINUX) diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile index 718424d4d301..fae698cb5c7f 100644 --- a/x11/nvidia-settings/Makefile +++ b/x11/nvidia-settings/Makefile @@ -7,7 +7,7 @@ PORTNAME= nvidia-settings PORTVERSION= 1.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \ ${MASTER_SITE_LOCAL:S,$,bland/,} @@ -15,23 +15,23 @@ MASTER_SITES= ${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \ MAINTAINER= bland@FreeBSD.org COMMENT= Display Control Panel for X NVidia driver -USE_X_PREFIX= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_GL= gl +USE_XORG= xv PLIST_FILES= bin/nvidia-settings MAN1= nvidia-settings.1 MAKE_ENV= ROOT=${PREFIX} \ CC=${CC} \ - X11R6_LIB_DIR=${X11BASE}/lib \ - X11R6_INC_DIR=${X11BASE}/include \ + X11R6_LIB_DIR=${LOCALBASE}/lib \ + X11R6_INC_DIR=${LOCALBASE}/include \ LDFLAGS="${PTHREAD_LIBS}" pre-build: cd ${WRKSRC}/src/libXNVCtrl; \ - ${CC} -c -I${X11BASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \ + ${CC} -c -I${LOCALBASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \ -DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \ ${RM} -f libXNVCtrl.a; \ ar clq libXNVCtrl.a NVCtrl.o; \ diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile index 620098a7f102..3ea01d572f12 100644 --- a/x11/p5-X11-GUITest/Makefile +++ b/x11/p5-X11-GUITest/Makefile @@ -8,7 +8,7 @@ PORTNAME= X11-GUITest PORTVERSION= 0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \ ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} @@ -20,11 +20,11 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf MAINTAINER= ports@FreeBSD.org COMMENT= Provides GUI testing/interaction facilities -USE_XLIB= yes +USE_XORG= x11 xt xext xtst PERL_CONFIGURE= 5.8.0+ MAN3= X11::GUITest.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/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile index a23175ea708f..05faeee2fac1 100644 --- a/x11/p5-X11-IdleTime/Makefile +++ b/x11/p5-X11-IdleTime/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline \ ${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version RUN_DEPENDS= ${BUILD_DEPENDS} -USE_XLIB= yes +USE_XORG= x11 xscrnsaver PERL_CONFIGURE= 5.8.0+ MANPREFIX= ${SITE_PERL} @@ -26,7 +26,7 @@ MAN3= X11::IdleTime.3 post-patch: .for i in IdleTime.pm - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${i} + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${i} @${PERL} -pi -e "s,[\d\.]+,${PORTVERSION:C/0./0.0/}, if m{VERSION}" ${WRKSRC}/${i} .endfor diff --git a/x11/padkey/Makefile b/x11/padkey/Makefile index c647ce89b09c..10ce75a02623 100644 --- a/x11/padkey/Makefile +++ b/x11/padkey/Makefile @@ -20,7 +20,7 @@ PLIST_FILES= bin/padkey PORTDOCS= CREDITS README post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/padkey ${PREFIX}/bin/padkey diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile index 589e756a79b6..1a93349afc3b 100644 --- a/x11/portoseguro/Makefile +++ b/x11/portoseguro/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} do-install: .for i in portoseguro portoseguro.conf - ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${LOCALBASE}/bin .endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/x11/props/Makefile b/x11/props/Makefile index 06e4d83afd71..8ca258127742 100644 --- a/x11/props/Makefile +++ b/x11/props/Makefile @@ -22,7 +22,7 @@ USE_IMAKE= yes MAKE_ARGS= INFOFILES="" post-install: - ${MKDIR} ${X11BASE}/lib/X11/locale/C/props; \ - ${INSTALL_DATA} ${WRKSRC}/C/* ${X11BASE}/lib/X11/locale/C/props + ${MKDIR} ${PREFIX}/lib/X11/locale/C/props; \ + ${INSTALL_DATA} ${WRKSRC}/C/* ${PREFIX}/lib/X11/locale/C/props .include <bsd.port.mk> diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile index b7d67d9b3714..bcc3af61e288 100644 --- a/x11/qrash/Makefile +++ b/x11/qrash/Makefile @@ -7,7 +7,7 @@ PORTNAME= qrash PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://qmg.org/files/demos/qmg/ \ ftp://qmg.org/pub/demos/qmg/ \ @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 USE_GCC= 2.95 USE_GMAKE= yes USE_PERL5= yes # XXX -USE_X_PREFIX= yes +USE_XORG= x11 ALL_TARGET= qrash diff --git a/x11/qrash/files/patch-ae b/x11/qrash/files/patch-ae index 8fbb3aa9c4ef..7c956d627c69 100644 --- a/x11/qrash/files/patch-ae +++ b/x11/qrash/files/patch-ae @@ -3,7 +3,7 @@ @@ -1,10 +1,10 @@ # Maximum optimization -CXXFLAGS += -O6 -ffast-math -funroll-loops -w -+CXXFLAGS += -I$(X11BASE)/include -ffast-math -funroll-loops ++CXXFLAGS += -I$(LOCALBASE)/include -ffast-math -funroll-loops # Debugging options #CXXFLAGS += -g diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 8acef763b634..03c8e786e561 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -8,7 +8,7 @@ PORTNAME= opengl PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 1 CATEGORIES?= x11 MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -25,8 +25,8 @@ QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_GL= yes -USE_XLIB= yes +USE_GL= glu +USE_XORG= x11 ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile index f15c3304afd1..e669ed30c98f 100644 --- a/x11/rxvt-devel/Makefile +++ b/x11/rxvt-devel/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp --enable-languages \ --with-xpm --enable-xpm-background --enable-transparency \ --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= rxvt.1 diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 6f21e23bdab7..ba80b7eb93e1 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -19,14 +19,12 @@ COMMENT= A clone of the terminal emulator rxvt modified to support Unicode PATCH_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Encode/HanExtra.pm:${PORTSDIR}/chinese/p5-Encode-HanExtra \ ${SITE_PERL}/${PERL_ARCH}/Encode/JIS2K.pm:${PORTSDIR}/converters/p5-Encode-JIS2K .endif -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config -USE_XORG= xpm +USE_GNOME= pkgconfig +USE_XORG= xpm xft GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" -CONFIGURE_ARGS= --enable-shared --enable-everything --with-term=rxvt \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ARGS= --enable-shared --enable-everything --with-term=rxvt CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_BZIP2= yes diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index a9d596e40af2..5398d126ef70 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -21,8 +21,8 @@ USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp \ --with-xpm --enable-xpm-background --enable-transparency \ - --with-xpm-includes=${X11BASE}/include/X11 \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=${LOCALBASE}/include/X11 \ + --with-xpm-library=${LOCALBASE}/lib MAN1= rxvt.1 PLIST_FILES= bin/rxvt diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile index de4245338302..1a4548f9df77 100644 --- a/x11/setxkbmap/Makefile +++ b/x11/setxkbmap/Makefile @@ -15,7 +15,7 @@ COMMENT= Set the keyboard using the X Keyboard Extension XORG_CAT= app USE_XORG= xkbfile x11 -CONFIGURE_ARGS= --with-xkb-config-root=${X11BASE}/share/X11/xkb +CONFIGURE_ARGS= --with-xkb-config-root=${LOCALBASE}/share/X11/xkb PLIST_FILES= bin/setxkbmap diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile index 45d9f900ca57..d0e129130125 100644 --- a/x11/sisctrl/Makefile +++ b/x11/sisctrl/Makefile @@ -7,21 +7,20 @@ PORTNAME= sisctrl PORTVERSION= 0.0.20051202 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://www.winischhofer.net/sis/ MAINTAINER= bland@FreeBSD.org COMMENT= Display Control Panel for XFree86/X.org SiS driver -USE_X_PREFIX= yes +USE_XORG= x11 ice xxf86vm xinerama xv xrandr USE_GNOME= gtk20 USE_GMAKE= yes -USE_GCC= 3.4+ GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-xv-path=${X11BASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${X11BASE}/lib" +CONFIGURE_ARGS= --with-xv-path=${LOCALBASE}/lib +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_FILES= bin/sisctrl MAN1= sisctrl.1x diff --git a/x11/slock/Makefile b/x11/slock/Makefile index 815c5bddb6e1..b3f74c1371e3 100644 --- a/x11/slock/Makefile +++ b/x11/slock/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://www.suckless.org/download/ CENKES MAINTAINER= infofarmer@FreeBSD.org COMMENT= Simple X screen locker -MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \ - X11INC="${X11BASE}/include" CC="${CC}" \ +MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \ + X11INC="${LOCALBASE}/include" CC="${CC}" \ MANPREFIX="${MANPREFIX}/man" PLIST_FILES= bin/slock -USE_XLIB= yes +USE_XORG= x11 xt post-patch: @${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\ diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 85b79486de82..721176f15c72 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -7,7 +7,7 @@ PORTNAME= startup-notification PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://www.freedesktop.org/software/startup-notification/releases/ @@ -18,8 +18,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Library that supports startup notification spec from freedesktop.org USE_BZIP2= yes +USE_XORG= x11 USE_AUTOTOOLS= libtool:15 -USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes diff --git a/x11/swarp/Makefile b/x11/swarp/Makefile index 565157fc0b22..2d74cac3796f 100644 --- a/x11/swarp/Makefile +++ b/x11/swarp/Makefile @@ -15,8 +15,8 @@ MASTER_SITES= http://www.suckless.org/download/ \ MAINTAINER= daniel@roe.ch COMMENT= X11 generic pointer warping utility -MAKE_ARGS= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lX11" \ - CFLAGS="${CFLAGS} -I${X11BASE}/include \ +MAKE_ARGS= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lX11" \ + CFLAGS="${CFLAGS} -I${LOCALBASE}/include \ -DVERSION=\\\"${PORTVERSION}\\\"" \ LD=${CC} diff --git a/x11/temperature.app/files/patch-Makefile b/x11/temperature.app/files/patch-Makefile index f1e980335707..1a2df17c74ff 100644 --- a/x11/temperature.app/files/patch-Makefile +++ b/x11/temperature.app/files/patch-Makefile @@ -6,14 +6,14 @@ DESTDIR = -GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Temperature.app -X11_BINDIR = /usr/X11R6/bin -+GNUSTEP_BINDIR = $(X11BASE)/GNUstep/Apps/Temperature.app -+X11_BINDIR = $(X11BASE)/bin ++GNUSTEP_BINDIR = $(LOCALBASE)/GNUstep/Apps/Temperature.app ++X11_BINDIR = $(LOCALBASE)/bin CXX=c++ -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 -+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(X11BASE)/include -+LDFLAGS += -L$(X11BASE)/lib -lXpm -lXext -lX11 ++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(LOCALBASE)/include ++LDFLAGS += -L$(LOCALBASE)/lib -lXpm -lXext -lX11 OBJECTS = Main.o Temperature.o Xpm.o diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile index 30ddc776b16c..5eb7d4d30edd 100644 --- a/x11/tkXwin/Makefile +++ b/x11/tkXwin/Makefile @@ -7,17 +7,16 @@ PORTNAME= tkXwin PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITES_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session GNU_CONFIGURE= yes -USE_X_PREFIX= yes +USE_XORG= xt xscrnsaver USE_LDCONFIG= yes USE_TK= 84+ diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile index 097c255c3358..35363480217e 100644 --- a/x11/trayer/Makefile +++ b/x11/trayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= trayer PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/t/trayer @@ -18,9 +18,9 @@ COMMENT= Lightweight GTK2-based systray for UNIX desktop USE_GNOME= gtk20 glib20 pango atk USE_ICONV= yes - +USE_XORG= xmu USE_GMAKE= yes -MAKE_ARGS= "PREFIX=${X11BASE}" +MAKE_ARGS= "PREFIX=${PREFIX}" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .if !defined(NOPORTDOCS) diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile index 5e0d52ce79a0..4cec92714365 100644 --- a/x11/tycoon/Makefile +++ b/x11/tycoon/Makefile @@ -18,7 +18,7 @@ COMMENT= A nifty set of desktop apps, including floating buttons LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm REINPLACE_ARGS= -i "" post-patch: diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 49b88b8436aa..2dd877672d56 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -40,8 +40,8 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ --with-Logo=beastie.xpm \ --with-gfx-incs=${LOCALBASE}/include \ --with-gfx-libs=${LOCALBASE}/lib \ - --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \ - --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \ + --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \ + --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \ --with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm MAN1= wdm.1 wdmLogin.1 @@ -49,8 +49,8 @@ MAN1= wdm.1 wdmLogin.1 CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT LDFLAGS= -L${LOCALBASE}/lib -lintl -DEF_SERVER?= ${X11BASE}/bin/X -XRDB_PATH?= ${X11BASE}/bin/xrdb +DEF_SERVER?= ${LOCALBASE}/bin/X +XRDB_PATH?= ${LOCALBASE}/bin/xrdb WDMDIR= ${PREFIX}/lib/X11/wdm diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile index 27dd0eac8a0a..7bcce6f9c4af 100644 --- a/x11/wmbutton/Makefile +++ b/x11/wmbutton/Makefile @@ -20,9 +20,9 @@ SUB_FILES= pkg-message do-build: cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} \ - -I${X11BASE}/include/X11 -I${X11BASE}/include \ + -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \ wmb_libs.c wmbutton.c -o wmbutton \ - -L${X11BASE}/lib -lXpm -lXext -lX11 + -L${LOCALBASE}/lib -lXpm -lXext -lX11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmbutton ${PREFIX}/bin/wmbutton diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile index 30efd09be12b..bd43bb94f73c 100644 --- a/x11/wmdrawer/Makefile +++ b/x11/wmdrawer/Makefile @@ -36,7 +36,7 @@ post-patch: s,LDFLAGS =,LDFLAGS+=,g; s,PREFIX =,#PREFIX =,g; \ s,$$[(]DESTDIR[)]/usr/local,${PREFIX},g; \ s,CC =,#CC =,g; \ - s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile + s,/usr/X11R6,${LOCALBASE},g" ${WRKSRC}/Makefile post-install: @${MKDIR} ${DATADIR} diff --git a/x11/wmfstatus/files/patch-Makefile b/x11/wmfstatus/files/patch-Makefile index 1c6d893a129e..c0855d4a0ffc 100644 --- a/x11/wmfstatus/files/patch-Makefile +++ b/x11/wmfstatus/files/patch-Makefile @@ -2,7 +2,7 @@ +++ Makefile Thu Dec 27 18:35:43 2001 @@ -1,6 +1,6 @@ -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${X11BASE}/lib ++LIBDIR = -L${LOCALBASE}/lib LIBS = -lXpm -lXext -lX11 -FLAGS = -O2 +FLAGS = ${CFLAGS} @@ -14,7 +14,7 @@ .c.o: - cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o -+ ${CC} -I${X11BASE}/include $(FLAGS) -c -Wall $< -o $*.o ++ ${CC} -I${LOCALBASE}/include $(FLAGS) -c -Wall $< -o $*.o wmfstatus: $(OBJS) - cc $(FLAGS) -o wmfstatus $^ -lXext $(LIBDIR) $(LIBS) diff --git a/x11/wmmatrix/files/patch-aa b/x11/wmmatrix/files/patch-aa index 8a0f151d0d80..15e9328637a6 100644 --- a/x11/wmmatrix/files/patch-aa +++ b/x11/wmmatrix/files/patch-aa @@ -8,9 +8,9 @@ -LIBDIR = -L/usr/X11R6/lib +CC ?= gcc +CFLAGS ?= -O2 -Wall -+INCDIR = -I${X11BASE}/include -+DESTDIR= ${PREFIX} -+LIBDIR = -L${X11BASE}/lib ++INCDIR = -I${LOCALBASE}/include ++DESTDIR= ${LOCALBASE} ++LIBDIR = -L${LOCALBASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext diff --git a/x11/wmmenu/files/patch-Makefile b/x11/wmmenu/files/patch-Makefile index f73cdcbc762e..fb20c04d5c31 100644 --- a/x11/wmmenu/files/patch-Makefile +++ b/x11/wmmenu/files/patch-Makefile @@ -11,7 +11,7 @@ -XROOT = /usr/X11R6 -DAROOT = /usr/local -+XROOT = $(X11BASE) ++XROOT = $(LOCALBASE) +DAROOT = $(LOCALBASE) # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command diff --git a/x11/wmxss/files/patch-Src::Makefile b/x11/wmxss/files/patch-Src::Makefile index b6bbfcd593ea..c5f1a187b4c2 100644 --- a/x11/wmxss/files/patch-Src::Makefile +++ b/x11/wmxss/files/patch-Src::Makefile @@ -20,9 +20,9 @@ -OBJS = wmxss.o \ - xutils.o -+CFLAGS+= -I${X11BASE}/include -O2 -Wall ++CFLAGS+= -I${LOCALBASE}/include -O2 -Wall +LDADD+= -lXpm -lX11 -lXext -+LDADD+= -L${X11BASE}/lib ++LDADD+= -L${LOCALBASE}/lib +NOMAN= diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index de799d989870..90176ad3cf1f 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -7,7 +7,7 @@ PORTNAME= workrave PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= SF @@ -17,9 +17,9 @@ COMMENT= A Gnome RSI prevention tool OPTIONS= GNOME "Build with Gnome support" on \ NETWORK "Build with network support" on +USE_XORG= x11 xmu USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool -USE_GCC= 3.4+ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-gconf diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile index 4ae5cb383056..cbf5feabf322 100644 --- a/x11/wrapper/Makefile +++ b/x11/wrapper/Makefile @@ -21,7 +21,7 @@ USE_XORG= x11 .include <bsd.port.pre.mk> -XSERVER= -DXSERVER_PATH=\"${X11BASE}/bin/Xorg\" +XSERVER= -DXSERVER_PATH=\"${LOCALBASE}/bin/Xorg\" PKGNAMEPREFIX= xorg- COMMENT= Wrapper for X.org X11 server diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index 0b36db0bd8d7..8c91821266c5 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -9,13 +9,12 @@ PORTNAME= wterm PORTVERSION= 6.2.9 PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= adam-ports@blacktabby.org COMMENT= A color vt102 terminal emulator with transparency support -BUILD_DEPENDS= ${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker +BUILD_DEPENDS= ${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker USE_XORG= xpm GNU_CONFIGURE= yes @@ -23,8 +22,8 @@ CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \ --disable-delete-key --disable-backspace-key \ --enable-next-scrollbar --enable-utmp --enable-wtmp \ --enable-menubar --enable-graphics --with-term=xterm-color \ - --with-xpm-includes=${X11BASE} --with-xpm-library=${X11BASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/WINGs" + --with-xpm-includes=${LOCALBASE} --with-xpm-library=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs" MAN1= wterm.1 PLIST_FILES= bin/wterm diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 7410e689b75d..ae6f4136d4f5 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -7,15 +7,17 @@ PORTNAME= x3270 PORTVERSION= 3.3.7 +PORTREVISION= 1 CATEGORIES= x11 net -MASTER_SITES= SFE +MASTER_SITES= SF EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= 3270 Terminal emulator -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ + mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ + mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale USE_IMAKE= yes GNU_CONFIGURE= yes diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile index da1f81c6adc2..47fd7111109e 100644 --- a/x11/xballoon/Makefile +++ b/x11/xballoon/Makefile @@ -21,7 +21,7 @@ MAN1= xballoon.1 PLIST_FILES= bin/xballoon post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g ; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \ s|gcc |$${CC} |g ; \ s|-O |$${CFLAGS} |g' ${WRKSRC}/Makefile diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile index 93fccde40276..0d8170b130d3 100644 --- a/x11/xbanner/Makefile +++ b/x11/xbanner/Makefile @@ -19,7 +19,7 @@ COMMENT= Make your XDM login screen look beautiful USE_XORG= xpm x11 post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/xres.c ${WRKSRC}/samples/XBanner.ad post-install: diff --git a/x11/xbanner/files/patch-aa b/x11/xbanner/files/patch-aa index ec588239ad50..291e999b9004 100644 --- a/x11/xbanner/files/patch-aa +++ b/x11/xbanner/files/patch-aa @@ -40,10 +40,10 @@ ! BINDIR =$(PREFIX)/bin # Library directories for Linux -! XLIBDIR =$(X11BASE)/lib +! XLIBDIR =$(LOCALBASE)/lib # Include directory for gcc (if you get X11/Xlib.h: file not found) -! INCDIR =-I$(X11BASE)/include +! INCDIR =-I$(LOCALBASE)/include # Library directories for the Ultrix (probably most Unixes) #XLIBDIR =/usr/lib/X11 diff --git a/x11/xbanner/files/patch-ac b/x11/xbanner/files/patch-ac index 511a61378370..e6ff71c417c0 100644 --- a/x11/xbanner/files/patch-ac +++ b/x11/xbanner/files/patch-ac @@ -24,7 +24,7 @@ #ifndef vms ! # if (defined(BSD) && (BSD >= 199306)) -! strcpy(line,"%%X11BASE%%/lib/X11/app-defaults/"); +! strcpy(line,"%%LOCALBASE%%/lib/X11/app-defaults/"); ! # else ! strcpy(line,"/usr/lib/X11/app-defaults/"); ! # endif diff --git a/x11/xbanner/files/patch-ae b/x11/xbanner/files/patch-ae index bcb35f5e0649..8363c175e201 100644 --- a/x11/xbanner/files/patch-ae +++ b/x11/xbanner/files/patch-ae @@ -13,7 +13,7 @@ XBanner.BarSize: 12 ! Name of the pixmap file to tile over the root window -! !XBanner.BgPixFile: %%X11BASE%%/include/X11/pixmaps/xdm_bg.xpm +! !XBanner.BgPixFile: %%LOCALBASE%%/include/X11/pixmaps/xdm_bg.xpm ! The number of ripples for the Ripples BG style XBanner.Ripples: 3 diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index bd2adb76c104..a21aea484423 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -15,7 +15,6 @@ COMMENT= The X protocol C-language Binding (XCB) protocol BUILD_DEPENDS= xmllint:${PORTSDIR}/textproc/libxml2 -PREFIX?= ${X11BASE} USE_BZIP2= yes USE_GNOME= gnomehack GNU_CONFIGURE= yes diff --git a/x11/xclick/Makefile b/x11/xclick/Makefile index b35f863171e6..10065ca94bd8 100644 --- a/x11/xclick/Makefile +++ b/x11/xclick/Makefile @@ -23,7 +23,7 @@ PLIST_FILES= bin/${PORTNAME} do-build: @cd ${WRKSRC} && \ - ${CC} -L${X11BASE}/lib -I${X11BASE}/include click.c \ + ${CC} -L${LOCALBASE}/lib -I${LOCALBASE}/include click.c \ -lX11 -lXtst -o ${PORTNAME} do-install: diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index c707e6c73ee0..e9f25c718cfc 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -18,13 +18,13 @@ COMMENT= X utility to translate rgb values into X color names LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -WRKSRC= $(WRKDIR)/xcolorsel +WRKSRC= ${WRKDIR}/xcolorsel USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= xcolorsel.1 post-patch: - @${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad + @${ECHO_CMD} "*.file: ${LOCALBASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad @${REINPLACE_CMD} -e 's|#include <malloc.h>||g' \ -e 's|/Xaw/|/Xaw3d/|g' ${WRKSRC}/*.[ch] @${REINPLACE_CMD} -e 's|app2head|./app2head|g' \ diff --git a/x11/xcut/files/patch-aa b/x11/xcut/files/patch-aa index 1ddcfd603131..1ac717af3517 100644 --- a/x11/xcut/files/patch-aa +++ b/x11/xcut/files/patch-aa @@ -6,8 +6,8 @@ -BINDIR=/usr/local/bin -MANPATH=/usr/local/man -+BINDIR=${X11BASE}/bin -+MANPATH=${X11BASE}${MAN1PREFIX}/man ++BINDIR=${LOCALBASE}/bin ++MANPATH=${LOCALBASE}${MAN1PREFIX}/man MANSUFFIX=1 XCOMM Build xcut and manpage diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile index d1206dc466aa..36f90dc24df9 100644 --- a/x11/xdotool/Makefile +++ b/x11/xdotool/Makefile @@ -7,6 +7,7 @@ PORTNAME= xdotool DISTVERSION= 20070903 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.semicomplete.com/files/xdotool/ \ http://www.atarininja.org/~wxs/distfiles/ @@ -15,7 +16,7 @@ MAINTAINER= wxs@FreeBSD.org COMMENT= Programatically simulate keyboard input or mouse activity USE_GNOME= pkgconfig -USE_XLIB= yes +USE_XORG= x11 xtst ALL_TARGET= ${PORTNAME} PLIST_FILES= bin/xdotool diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile index 56a667784883..ee2d2ff4d984 100644 --- a/x11/xdtm/Makefile +++ b/x11/xdtm/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A graphical shell for the X Window System USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm WRKSRC= ${WRKDIR}/xdtm MAN1= xdtm.1 diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile index 25583b8df55d..59a357265270 100644 --- a/x11/xfce4-taskmanager/Makefile +++ b/x11/xfce4-taskmanager/Makefile @@ -16,8 +16,6 @@ DIST_SUBDIR= xfce4 MAINTAINER= miwi@FreeBSD.org COMMENT= A task manager for XFCE -CONFIGURE_ENV= PKG_CONFIG_PATH=${X11BASE}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig - GNU_CONFIGURE= yes USE_BZIP= yes USE_GETTEXT= yes diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile index 0757c79229fd..e3c22550befe 100644 --- a/x11/xfree86_xkb_xml/Makefile +++ b/x11/xfree86_xkb_xml/Makefile @@ -7,9 +7,9 @@ PORTNAME= xfree86_xkb_xml PORTVERSION= 0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= gswitchit MAINTAINER= gnome@FreeBSD.org @@ -17,12 +17,12 @@ COMMENT= A little set of XML files useful for dealing with XKB rules USE_ICONV= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= gnometarget USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --with-xkb-base=${X11BASE}/lib/X11/xkb +CONFIGURE_ARGS= --with-xkb-base=${LOCALBASE}/lib/X11/xkb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile index 75041aef7b93..fd65ecfb5a57 100644 --- a/x11/xgrab/Makefile +++ b/x11/xgrab/Makefile @@ -7,7 +7,7 @@ PORTNAME= xgrab PORTVERSION= 2.41 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications @@ -17,9 +17,9 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= jmz@FreeBSD.org COMMENT= An X11 image grabber -BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT} +BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb -USE_X_PREFIX= yes +USE_XORG= x11 USE_IMAKE= yes USE_DISPLAY= yes diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile index 003967529ca9..2229b5483fd7 100644 --- a/x11/xidle/Makefile +++ b/x11/xidle/Makefile @@ -16,8 +16,8 @@ MAINTAINER= novel@FreeBSD.org COMMENT= Run a program on X inactivity USE_BZIP2= yes -CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include -D__dead=static -MAKE_ARGS+= X11LIBDIR="${X11BASE}/lib" \ +CFLAGS+= -I${LOCALBASE}/include -D__dead=static +MAKE_ARGS+= X11LIBDIR="${LOCALBASE}/lib" \ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" USE_XORG= x11 xscrnsaver diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile index b270df25ef5b..f6c0f552ff99 100644 --- a/x11/xkbset/Makefile +++ b/x11/xkbset/Makefile @@ -18,7 +18,7 @@ MAN1= xkbset.1 USE_XORG= x11 USE_PERL5_BUILD= yes -MAKE_ARGS= X11BASE="${X11BASE}" X11PREFIX="${PREFIX}" \ +MAKE_ARGS= X11BASE="${LOCALBASE}" X11PREFIX="${PREFIX}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 843c15b4487f..4e91d24b70d7 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -16,9 +16,6 @@ COMMENT= X Keyboard Configuration Database BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp -# XXX - sigh -PREFIX= ${X11BASE} - USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile index ca088c06985c..e58293a63d74 100644 --- a/x11/xkeywrap/Makefile +++ b/x11/xkeywrap/Makefile @@ -7,14 +7,14 @@ PORTNAME= xkeywrap PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ MAINTAINER= ports@FreeBSD.org COMMENT= Record, repeat, and play key sequence from keyboard -USE_X_PREFIX= yes +USE_XORG= x11 xt MAN1= xkeywrap.1 MANCOMPRESSED= yes PORTSDOCDIR= ${PREFIX}/share/doc/xkeywrap diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index 5a58229e6814..e31d85b238f3 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -7,7 +7,7 @@ VERSION= 4.1 REVISION= 16 -PORTREVISION= 1 +PORTREVISION= 2 PORTNAME= xloadimage PORTVERSION= ${VERSION}.${REVISION} @@ -24,7 +24,7 @@ COMMENT= X11 Image Loading Utility PATCH_STRIP= -p1 EXTRA_PATCHES= ${WRKSRC}/debian/patches/*.dpatch -USE_XLIB= yes +USE_XORG= x11 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile index 26fd0d89e7ca..8a07f3b07aa1 100644 --- a/x11/xlupe/Makefile +++ b/x11/xlupe/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Magnifying glass for X. like xmag but with continously updates USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm PLIST_FILES= bin/xlupe diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile index 6101d039e0b2..901d6dc4c7d9 100644 --- a/x11/xmangekyou/Makefile +++ b/x11/xmangekyou/Makefile @@ -29,8 +29,8 @@ post-patch: @${REINPLACE_CMD} -e 's|= /usr/X11R6|= $${PREFIX}|g ; \ s|gcc |$${CC} |g ; \ s|-O |$${CFLAGS} |g ; \ - s|-I/usr/X11R6/|-I$${X11BASE}/|g ; \ - s|-L/usr/X11R6/|-L$${X11BASE}/|g' ${WRKSRC}/Makefile + s|-I/usr/X11R6/|-I$${LOCALBASE}/|g ; \ + s|-L/usr/X11R6/|-L$${LOCALBASE}/|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmangekyou ${PREFIX}/bin diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile index 8e19697416bb..e5ac66af1bd1 100644 --- a/x11/xmotd/Makefile +++ b/x11/xmotd/Makefile @@ -37,7 +37,7 @@ USE_MOTIF= yes .endif .if defined(WITH_XPM) -USE_XPM= yes +USE_XORG= xpm .endif post-extract: @@ -59,7 +59,7 @@ post-patch: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${X11BASE}/bin/xmotd + ${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${LOCALBASE}/bin/xmotd ${INSTALL_MAN} ${WRKSRC}/xmotd.8 ${MANPREFIX}/man/man8 .include <bsd.port.post.mk> diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile index 2e027bd6b20d..dfac0b26eae6 100644 --- a/x11/xmx/Makefile +++ b/x11/xmx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmx PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/ EXTRACT_SUFX= .tar.Z @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ob@breuninger.org COMMENT= An X protocol multiplexor -USE_X_PREFIX= yes +USE_XORG= x11 MAN1= xmx.1 PLIST_FILES= bin/xmx diff --git a/x11/xmx/files/patch-aa b/x11/xmx/files/patch-aa index e9bee16fd789..d8ac3b0afbcb 100644 --- a/x11/xmx/files/patch-aa +++ b/x11/xmx/files/patch-aa @@ -29,8 +29,8 @@ - -$(XMX): $(OFILES) - cc $(CFLAGS) -o $(XMX) $(OFILES) $(LIB) -+LIBPATH = -L${X11BASE}/lib -+INCPATH = -I${X11BASE}/include ++LIBPATH = -L${LOCALBASE}/lib ++INCPATH = -I${LOCALBASE}/include -debug: - make xmxd CFLAGS="$(DBGFG)" LIB="$(DEBUGLIB)" diff --git a/x11/xnodecor/files/Makefile b/x11/xnodecor/files/Makefile index 36716bb8b1c8..be49a441103f 100644 --- a/x11/xnodecor/files/Makefile +++ b/x11/xnodecor/files/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CFLAGS= -I${X11BASE}/include -LDFLAGS= -L${X11BASE}/lib +CFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib LIBS= -lX11 all: xnodecor @@ -9,7 +9,7 @@ xnodecor: $(CC) -o xnodecor xnodecor.c $(CFLAGS) $(LDFLAGS) $(LIBS) install: - ${BSD_INSTALL_PROGRAM} xnodecor ${X11BASE}/bin + ${BSD_INSTALL_PROGRAM} xnodecor ${LOCALBASE}/bin clean: rm -f *.rej a.out core xnodecor diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index d40fe7d54dcd..ec91aac278fe 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -15,8 +15,6 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org apps meta-port -PREFIX?= ${X11BASE} - RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index cbdeee5b6dab..d791a81da42b 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-libraries PORTVERSION= 7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -18,51 +18,49 @@ COMMENT= X.org libraries meta-port NO_BUILD= yes -PREFIX?= ${X11BASE} - -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ - ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ - ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ - ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \ - ${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \ - ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ - ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ - ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ - ${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \ - ${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \ - ${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \ - ${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \ - ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ - ${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \ - ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ - ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \ - ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ - ${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \ - ${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \ - ${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ - ${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ - ${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ - ${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ - ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ - ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \ - ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \ - ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \ - ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \ - ${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \ - ${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \ - ${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ - ${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \ - ${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ - ${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ - ${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ - ${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ - ${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ - ${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ - ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ - ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ - ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ - ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ - ${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ + ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ + ${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \ + ${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \ + ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ + ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ + ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ + ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \ + ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \ + ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \ + ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \ + ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ + ${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \ + ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ + ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \ + ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \ + ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \ + ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ + ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ + ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ + ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ + ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ + ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \ + ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \ + ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \ + ${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \ + ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \ + ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \ + ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ + ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \ + ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ + ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ + ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ + ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ + ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ + ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ + ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ + ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ + ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ + ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ + ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6) pre-everything:: @@ -78,7 +76,7 @@ pre-everything:: fi .elif !exists(/usr/X11R6) && !defined(WITHOUT_X11R6_SYMLINK) pre-install:: - ${LN} -s ${X11BASE} /usr/X11R6 || ${TRUE} + ${LN} -s ${LOCALBASE} /usr/X11R6 || ${TRUE} .endif do-install: diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile index 23671b6847e8..9cd01dcae685 100644 --- a/x11/xorg-protos/Makefile +++ b/x11/xorg-protos/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-protos PORTVERSION= 7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -16,8 +16,6 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org protos meta-port -USE_X_PREFIX= yes - BUILD_DEPENDS= ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \ ${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \ ${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \ diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index f02f5f3885c7..b070ca9886fc 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -17,23 +17,22 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org complete distribution metaport NO_BUILD= yes -PREFIX?= ${X11BASE} -RUN_DEPENDS+= ${X11BASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri +RUN_DEPENDS+= ${LOCALBASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri # data -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ - ${X11BASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ + ${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes # doc -RUN_DEPENDS+= ${X11BASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs +RUN_DEPENDS+= ${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs # app, lib, font, driver, proto -RUN_DEPENDS+= ${X11BASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \ - ${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \ - ${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \ - ${X11BASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \ - ${X11BASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos +RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \ + ${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \ + ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \ + ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \ + ${LOCALBASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos .if defined(XORG_COMPLETE) RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \ @@ -59,7 +58,7 @@ DEPENDS_TARGET="package" .endif .if ${ARCH} != "alpha" && ${ARCH} != "ia64" -RUN_DEPENDS+= ${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server +RUN_DEPENDS+= ${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server .endif .include <bsd.port.post.mk> diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile index 1c9738659931..607f4a620d05 100644 --- a/x11/xrestop/Makefile +++ b/x11/xrestop/Makefile @@ -7,20 +7,21 @@ PORTNAME= xrestop PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://projects.o-hand.com/sources/${PORTNAME}/ MAINTAINER= bland@FreeBSD.org COMMENT= X11 server side resource usage statistics monitor -USE_X_PREFIX= yes +USE_XORG= x11 xext xrender xt xres xproto USE_GMAKE= yes -USE_GNOME= gnometarget +USE_GNOME= gnometarget pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS=-I${X11BASE}/include \ - LDFLAGS=-L${X11BASE}/lib +CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib \ + XLIBS="-L${LOCALBASE}/lib -lX11" MAN1= xrestop.1 PLIST_FILES= bin/xrestop diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile index 5dd59e9fb05b..eba30e191a4a 100644 --- a/x11/xrootconsole/Makefile +++ b/x11/xrootconsole/Makefile @@ -9,13 +9,12 @@ PORTNAME= xrootconsole PORTVERSION= 0.6 PORTREVISION= 1 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Writes any log live onto the background -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes MAN1= xrootconsole.1 @@ -24,7 +23,7 @@ PLIST_FILES= bin/xrootconsole post-patch: @${REINPLACE_CMD} -e 's|^CC =|CC ?=|g ; \ s|^CFLAGS = -O2|CFLAGS +=|g ; \ - s|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/Makefile + s|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrootconsole ${PREFIX}/bin diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile index ac5d043c4b3e..429258743e16 100644 --- a/x11/xrsi/Makefile +++ b/x11/xrsi/Makefile @@ -9,8 +9,7 @@ PORTNAME= xrsi PORTVERSION= 0.9 PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xrsi +MASTER_SITES= SF MAINTAINER= carpetsmoker@xs4all.nl COMMENT= A minimalist break enforcer for linux/unix for the prevention of RSI @@ -20,7 +19,7 @@ PLIST_FILES= bin/xrsi PORTDOCS= Readme Licence do-build: - ${CC} ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib -lX11 -o ${WRKSRC}/xrsi ${WRKSRC}/xrsi.c + ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -o ${WRKSRC}/xrsi ${WRKSRC}/xrsi.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrsi ${PREFIX}/bin/ diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 12ae2dc840fc..b987c27e3f82 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -8,7 +8,7 @@ PORTNAME?= xscreensaver-gnome PORTVERSION= 4.24 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= x11 gnome MASTER_SITES= http://www.jwz.org/xscreensaver/ DISTNAME= xscreensaver-${PORTVERSION} @@ -20,9 +20,8 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]* -USE_XLIB= yes -USE_XPM= yes -USE_GL= yes +USE_XORG= x11 xpm +USE_GL= gl USE_GMAKE= yes USE_PERL5_RUN= yes USE_GNOME= gnomehier libglade2 gnomehack diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile index f851a842fc70..adafe25c0968 100644 --- a/x11/xscreensaver.app/Makefile +++ b/x11/xscreensaver.app/Makefile @@ -9,8 +9,7 @@ PORTNAME= XScreenSaver.App PORTVERSION= 2.3 PORTREVISION= 3 CATEGORIES= x11 windowmaker -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xscreensaverapp +MASTER_SITES= SF/xscreensaverapp MAINTAINER= hemi@puresimplicity.net COMMENT= WindowMaker dockapp to control XScreenSaver @@ -19,9 +18,9 @@ LIB_DEPENDS= dockapp.2:${PORTSDIR}/x11-wm/libdockapp PLIST_FILES= bin/XScreenSaver.App GNU_CONFIGURE= yes -CONFIGURE_ENV= LDFLAGS="-L${X11BASE}/lib" \ - CPPFLAGS="-I${X11BASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" -MAKE_ARGS= "LDFLAGS+=-L${X11BASE}/lib" +MAKE_ARGS= "LDFLAGS+=-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 3b7f1da8418b..498485e32107 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \ xml2.5:${PORTSDIR}/textproc/libxml2 \ glade-2.0.0:${PORTSDIR}/devel/libglade2 -USE_XPM= yes +USE_XORG= xpm USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile index 201fedf2b7b3..74f6bd69cc0c 100644 --- a/x11/xsnow/Makefile +++ b/x11/xsnow/Makefile @@ -15,7 +15,7 @@ MAINTAINER= jmz@FreeBSD.org COMMENT= Create a snowy and Santa-y desktop USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN6= xsnow.6 PLIST_FILES= bin/xsnow diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile index 945d9393247b..a90a8d1ccf82 100644 --- a/x11/xstarroll/Makefile +++ b/x11/xstarroll/Makefile @@ -7,7 +7,7 @@ PORTNAME= xstarroll PORTVERSION= 1.1b -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/ @@ -17,15 +17,14 @@ COMMENT= Letters fly to far, far, far away WRKSRC= ${WRKDIR}/${PORTNAME}-1.1 -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xt xaw ALL_TARGET= xstarroll MAN1= xstarroll.1 PLIST_FILES= bin/xstarroll post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g ; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \ s|gcc |$${CC} |g ; \ s|-O |$${CFLAGS} |g' ${WRKSRC}/Makefile diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile index 0f378293783f..24b937cc61c5 100644 --- a/x11/xstroke/Makefile +++ b/x11/xstroke/Makefile @@ -7,7 +7,7 @@ PORTNAME= xstroke PORTVERSION= 0.5.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \ http://www.handhelds.org/download/projects/xstroke/release-0.5/ @@ -15,9 +15,8 @@ MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Fullscreen gesture recognition -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - USE_BISON= build +USE_XORG= xft x11 USE_IMAKE= yes CFLAGS+= ${PTHREAD_CFLAGS} CPPFLAGS= -I${LOCALBASE}/include -I. diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index cedbf79c34f1..7d7492c5cd3b 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -20,8 +20,8 @@ BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit USE_XORG= xaw xft 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+=--enable-wide-chars --enable-luit --with-utempter \ --enable-narrowproto diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile index cb4f931a2d6e..5d484611a477 100644 --- a/x11/xtermcontrol/Makefile +++ b/x11/xtermcontrol/Makefile @@ -19,8 +19,8 @@ RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" PLIST_FILES= bin/xtermcontrol MAN1= ${PORTNAME}.1 diff --git a/x11/xtrlock/files/Makefile b/x11/xtrlock/files/Makefile index e0e02fe9ceed..26334d793097 100644 --- a/x11/xtrlock/files/Makefile +++ b/x11/xtrlock/files/Makefile @@ -18,7 +18,7 @@ LDLIBS=-lX11 -lcrypt CC?=gcc -CFLAGS+=-I${X11BASE}/include -L${X11BASE}/lib +CFLAGS+=-I${LOCALBASE}/include -L${LOCALBASE}/lib INSTALL=install -c INSTALL_PROGRAM = ${INSTALL} INSTPGMFLAGS = -s -o root -m4111 diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 3c699cb0232b..7c2f32796b1c 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -8,7 +8,7 @@ PORTNAME= xvattr PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -17,6 +17,7 @@ COMMENT= Getting and setting Xv attributes USE_PERL5_BUILD= yes USE_GNOME= gtk12 +USE_XORG= x11 xv GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index 3757ddbdfa40..788cd3e537b0 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -25,7 +25,7 @@ USE_IMAKE= yes .include <bsd.port.pre.mk> .if defined(WITH_XAW3D) -BUILD_DEPENDS= ${X11BASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d +BUILD_DEPENDS= ${LOCALBASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d .endif .if defined(WITH_XAW3D) diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile index 17917fdaee59..f5b2d6e3ba76 100644 --- a/x11/xxkb/Makefile +++ b/x11/xxkb/Makefile @@ -8,15 +8,14 @@ PORTNAME= xxkb PORTVERSION= 1.11 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= xxkb +MASTER_SITES= SF/xxkb DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= alexander.pohoyda@gmx.net COMMENT= An XKB keyboard layout switcher and indicator WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes MAN1= xxkb.1 |