diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /x11-wm | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'x11-wm')
104 files changed, 251 insertions, 282 deletions
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile index ca44b13a3c05..f96a15dada99 100644 --- a/x11-wm/aewm/Makefile +++ b/x11-wm/aewm/Makefile @@ -7,17 +7,17 @@ PORTNAME= aewm PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.red-bean.com/~decklin/software/aewm/ MAINTAINER= ports@FreeBSD.org COMMENT= ICCCM-compliant window manager based on 9wm -USE_X_PREFIX= yes +USE_XORG= x11 xext xt xaw WANT_GNOME= yes USE_GMAKE= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}" +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${LOCALBASE}" MAN1= aeclients.1 aewm.1 diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile index aec0e3d45a51..6c14d4ee501f 100644 --- a/x11-wm/afterstep-i18n/Makefile +++ b/x11-wm/afterstep-i18n/Makefile @@ -7,7 +7,7 @@ PORTNAME= afterstep-i18n PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm afterstep MASTER_SITES= ${MASTER_SITE_AFTERSTEP:S/$/:afterstep/} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -30,8 +30,7 @@ COMMENT= The NeXTstep clone window manager with Fontset support RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock DIST_SUBDIR= afterstep -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_IMAKE= yes INSTALL_TARGET= install install.man MANCOMPRESSED= yes diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index fc9e092ec43b..3d4a34816f2d 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -7,7 +7,7 @@ PORTNAME= afterstep PORTVERSION= 2.2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm afterstep MASTER_SITES= ftp://ftp.afterstep.org/stable/ \ ${MASTER_SITE_SOURCEFORGE} @@ -26,7 +26,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif -RUN_DEPENDS= ${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli +RUN_DEPENDS= xli:${PORTSDIR}/graphics/xli USE_BZIP2= yes USE_GNOME= glib20 gtk20 pango diff --git a/x11-wm/ahwm/Makefile b/x11-wm/ahwm/Makefile index a4a0d7e64dc0..7ed86563e630 100644 --- a/x11-wm/ahwm/Makefile +++ b/x11-wm/ahwm/Makefile @@ -8,14 +8,14 @@ PORTNAME= ahwm PORTVERSION= 0.90 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://people.cs.uchicago.edu/~ahiorean/ahwm/ MAINTAINER= ports@FreeBSD.org COMMENT= An X11 window manager -USE_XLIB= yes +USE_XORG= x11 xext GNU_CONFIGURE= yes MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX} diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile index 2ce60b5a0452..bd22dbc16080 100644 --- a/x11-wm/alloywm/Makefile +++ b/x11-wm/alloywm/Makefile @@ -7,7 +7,7 @@ PORTNAME= alloywm PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.phatboydesigns.net/devel/ @@ -17,10 +17,10 @@ COMMENT= Has title bars, shading, resizing, automatic placement, window list BROKEN= Checksum mismatch HAS_CONFIGURE= yes -CONFIGURE_ARGS= --xroot=${X11BASE} +CONFIGURE_ARGS= --xroot=${LOCALBASE} PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 WANT_GNOME= yes REINPLACE_ARGS= -i'' -E SCRIPTS= ${WRKSRC}/scriptdir @@ -35,11 +35,11 @@ pre-configure: do-build: cd ${WRKSRC}/goodies && ${GMAKE} .for ii in client events main misc new screen widgets - cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${X11BASE}/include \ + cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${LOCALBASE}/include \ ${ii}.c .endfor cd ${WRKSRC}/src && ${CC} ${CFLAGS} -DSHAPE -o alloywm \ - -L${X11BASE}/lib -lXext -lX11 \ + -L${LOCALBASE}/lib -lXext -lX11 \ client.o events.o main.o misc.o new.o screen.o widgets.o pre-install: diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile index 544b1aa5c000..5dd6a2a57f95 100644 --- a/x11-wm/amaterus/Makefile +++ b/x11-wm/amaterus/Makefile @@ -7,7 +7,7 @@ PORTNAME= amaterus PORTVERSION= 0.34.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.taiyaki.org/amaterus/src/ @@ -16,7 +16,6 @@ COMMENT= A GTK+ window manager LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml -USE_XLIB= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile index 6c7f3e861900..8cea2be72749 100644 --- a/x11-wm/amiwm/Makefile +++ b/x11-wm/amiwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= amiwm PORTVERSION= 0.20.p48 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ \ http://www.plig.org/xwinman/archive/amiwm/ @@ -18,7 +18,7 @@ COMMENT= A window manager that makes your desktop look like an Amiga(TM) GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -DHAVE_X11_EXTENSIONS_SHAPE_H" -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xmu MAN1= amiwm.1 post-install: diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 6a14744567b7..9dc0b40ab15b 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -19,7 +20,7 @@ LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \ cairo.2:${PORTSDIR}/graphics/cairo \ freetype.9:${PORTSDIR}/print/freetype2 -USE_XLIB= yes +USE_XORG= x11 xft xext xinerama xt xrandr xproto MAN1= awesome.1 \ awesome-client.1 diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile index 6a14744567b7..9dc0b40ab15b 100644 --- a/x11-wm/awesome2/Makefile +++ b/x11-wm/awesome2/Makefile @@ -7,6 +7,7 @@ PORTNAME= awesome PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -19,7 +20,7 @@ LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \ cairo.2:${PORTSDIR}/graphics/cairo \ freetype.9:${PORTSDIR}/print/freetype2 -USE_XLIB= yes +USE_XORG= x11 xft xext xinerama xt xrandr xproto MAN1= awesome.1 \ awesome-client.1 diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile index 54cb257a42c5..72bfdd80790f 100644 --- a/x11-wm/badwm/Makefile +++ b/x11-wm/badwm/Makefile @@ -7,17 +7,16 @@ PORTNAME= badwm PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= BadWM-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Window manager based on evilwm -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile index 2f782e4267d0..4bf175d4b7d4 100644 --- a/x11-wm/bbconf/Makefile +++ b/x11-wm/bbconf/Makefile @@ -7,15 +7,14 @@ PORTNAME= bbconf PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Configurator for the Blackbox window manager -USE_X_PREFIX= yes +USE_XORG= x11 USE_QT_VER= 3 USE_PERL5_BUILD= yes GNU_CONFIGURE= yes diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile index 0ed02322b5fb..33023f84095e 100644 --- a/x11-wm/beryl-core/Makefile +++ b/x11-wm/beryl-core/Makefile @@ -32,8 +32,8 @@ USE_PERL5= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS+= --disable-berylmesa -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_XORG= xcomposite xfixes xdamage xrandr ice sm xinerama glproto diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile index d69a6b98967b..c40b3d5531c6 100644 --- a/x11-wm/beryl-manager/Makefile +++ b/x11-wm/beryl-manager/Makefile @@ -25,8 +25,8 @@ USE_GNOME= glib20 gtk20 INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAN1= beryl-manager.1 diff --git a/x11-wm/beryl-plugins-unsupported/Makefile b/x11-wm/beryl-plugins-unsupported/Makefile index 5695175b10a8..d7fadcd7c2c3 100644 --- a/x11-wm/beryl-plugins-unsupported/Makefile +++ b/x11-wm/beryl-plugins-unsupported/Makefile @@ -28,7 +28,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/x11-wm/beryl-plugins/Makefile b/x11-wm/beryl-plugins/Makefile index 49a0a640bff3..41e01c1c06a3 100644 --- a/x11-wm/beryl-plugins/Makefile +++ b/x11-wm/beryl-plugins/Makefile @@ -31,8 +31,8 @@ USE_GETTEXT= yes USE_LDCONFIG= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= DBUS "Enable dbus support" On diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile index 80b29ebf1cc8..44eeb475a436 100644 --- a/x11-wm/beryl-settings/Makefile +++ b/x11-wm/beryl-settings/Makefile @@ -31,7 +31,7 @@ USE_PYTHON= 2.4+ INSTALLS_ICONS= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" .include <bsd.port.mk> diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile index f921330c1582..b0840f887c36 100644 --- a/x11-wm/blwm/Makefile +++ b/x11-wm/blwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= blwm PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm portuguese MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -22,8 +22,7 @@ MAN1= blwm.1x PLIST= ${WRKDIR}/pkg-plist USE_GMAKE= yes MAKEFILE= Makefile.std -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 ice sm xext xpm DOCS= AUTHORS BUGS COPYING CREDITS FreeBSD INSTALAR LEIAME TODO post-patch: diff --git a/x11-wm/blwm/files/patch-Makefile.std b/x11-wm/blwm/files/patch-Makefile.std index 93729e357be3..fed87a0bb3db 100644 --- a/x11-wm/blwm/files/patch-Makefile.std +++ b/x11-wm/blwm/files/patch-Makefile.std @@ -5,7 +5,7 @@ # Directory of X Window System # -XDIR = /usr/X11R6 -+XDIR = $(X11BASE) ++XDIR = $(LOCALBASE) # # Directory where you install blwm binary diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile index eb008cf03b90..4ca7577cf460 100644 --- a/x11-wm/clementine/Makefile +++ b/x11-wm/clementine/Makefile @@ -7,27 +7,26 @@ PORTNAME= clementine PORTVERSION= 0.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Has title bars, iconizing, and styles (unstable) RUN_DEPENDS= xv:${PORTSDIR}/graphics/xv \ - rxvt:${PORTSDIR}/x11/rxvt + rxvt:${PORTSDIR}/x11/rxvt PLIST= ${WRKDIR}/pkg-plist PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 DOCS= COPYING HISTORY LICENSE REINPLACE_ARGS= -i'' -E post-patch: ${REINPLACE_CMD} 's:^CFLAGS:IGNORE:g ; s:^DEFINES:IGNORE:g ;\ - s:/usr/X11R6:${X11BASE}:g' \ + s:/usr/X11R6:${LOCALBASE}:g' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} 's:./clementine:${PREFIX}/bin/clementine:g' \ ${WRKSRC}/windowmanager.cpp diff --git a/x11-wm/compiz-fusion-plugins-extra/Makefile b/x11-wm/compiz-fusion-plugins-extra/Makefile index 83ab1ab997ef..e63a8a32b9f7 100644 --- a/x11-wm/compiz-fusion-plugins-extra/Makefile +++ b/x11-wm/compiz-fusion-plugins-extra/Makefile @@ -49,8 +49,8 @@ GCONF_SCHEMAS= compiz-addhelper.schemas \ compiz-widget.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas post-patch: diff --git a/x11-wm/compiz-fusion-plugins-main/Makefile b/x11-wm/compiz-fusion-plugins-main/Makefile index afd68ec9b654..fc28ad936376 100644 --- a/x11-wm/compiz-fusion-plugins-main/Makefile +++ b/x11-wm/compiz-fusion-plugins-main/Makefile @@ -51,8 +51,8 @@ GCONF_SCHEMAS= compiz-animation.schemas \ compiz-shift.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz-fusion-plugins-unsupported/Makefile b/x11-wm/compiz-fusion-plugins-unsupported/Makefile index 164a731b9a36..6cdac08ec83d 100644 --- a/x11-wm/compiz-fusion-plugins-unsupported/Makefile +++ b/x11-wm/compiz-fusion-plugins-unsupported/Makefile @@ -35,8 +35,8 @@ GCONF_SCHEMAS= compiz-fakeargb.schemas \ compiz-tile.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 83ab1ab997ef..e63a8a32b9f7 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -49,8 +49,8 @@ GCONF_SCHEMAS= compiz-addhelper.schemas \ compiz-widget.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas post-patch: diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile index afd68ec9b654..fc28ad936376 100644 --- a/x11-wm/compiz-plugins-main/Makefile +++ b/x11-wm/compiz-plugins-main/Makefile @@ -51,8 +51,8 @@ GCONF_SCHEMAS= compiz-animation.schemas \ compiz-shift.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile index 164a731b9a36..6cdac08ec83d 100644 --- a/x11-wm/compiz-plugins-unsupported/Makefile +++ b/x11-wm/compiz-plugins-unsupported/Makefile @@ -35,8 +35,8 @@ GCONF_SCHEMAS= compiz-fakeargb.schemas \ compiz-tile.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-schemas .include <bsd.port.mk> diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index 26178018d419..ca7d43ceb765 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -60,8 +60,8 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-zoom.schemas CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= RSVG "Enable librsvg2 support" on \ GTK "Enable gtk2 support" on \ diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index 1b40b99abfe9..b20fd60cc64a 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -18,7 +18,7 @@ COMMENT= An extension to twm, with support for multiple virtual screens, etc LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= ctwm.1 .include <bsd.port.pre.mk> diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk index 06a9cdae3fc4..c890eb9f59ad 100644 --- a/x11-wm/dwm/files/patch-config.mk +++ b/x11-wm/dwm/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-wm/e16/Makefile b/x11-wm/e16/Makefile index a2f8d56b53f2..b0f17f21d7de 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -7,29 +7,25 @@ PORTNAME= enlightenment PORTVERSION= 0.16.8.13 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= e16-${PORTVERSION}-0.01 MAINTAINER= vanilla@FreeBSD.org COMMENT= A very artistic X window manager -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - DATADIR= ${PREFIX}/share/e16 -USE_X_PREFIX= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xft x11 USE_ICONV= yes USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --disable-esdtest --disable-dependency-tracking \ --disable-rpath -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_ESOUND) USE_GNOME= esound diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile index acd7677dac11..7b7308204b27 100644 --- a/x11-wm/e16utils/Makefile +++ b/x11-wm/e16utils/Makefile @@ -7,7 +7,7 @@ PORTNAME= e16utils PORTVERSION= 0.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://public.planetmirror.com/pub/enlightenment/e16utils/ @@ -19,7 +19,6 @@ COMMENT= Standalone menu and keybinding editors for enlightment 0.16 LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm -USE_X_PREFIX= yes USE_GNOME= imlib SUB_STUBS= e16menuedit-0.1 e16keyedit-0.2 diff --git a/x11-wm/e16utils/files/patch-e16keyedit-0.2 b/x11-wm/e16utils/files/patch-e16keyedit-0.2 index ddb211f1fc68..2b6ab682c812 100644 --- a/x11-wm/e16utils/files/patch-e16keyedit-0.2 +++ b/x11-wm/e16utils/files/patch-e16keyedit-0.2 @@ -8,7 +8,7 @@ $FreeBSD$ LIB_DIRS = \ - -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib -+ -L${LOCALBASE}/lib -L${X11BASE}/lib ++ -L${LOCALBASE}/lib LIBS = \ - `gtk-config --libs` -lgdbm -lgdk_imlib -CFLAGS = \ diff --git a/x11-wm/e16utils/files/patch-e16menuedit-0.1 b/x11-wm/e16utils/files/patch-e16menuedit-0.1 index 038511f933d4..91244e3eb2fa 100644 --- a/x11-wm/e16utils/files/patch-e16menuedit-0.1 +++ b/x11-wm/e16utils/files/patch-e16menuedit-0.1 @@ -8,7 +8,7 @@ $FreeBSD$ LIB_DIRS = \ - -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib -+ -L${LOCALBASE}/lib -L${X11BASE}/lib ++ -L${LOCALBASE}/lib LIBS = \ - `gtk-config --libs` -lgdbm -lgdk_imlib -CFLAGS = \ diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile index 4a099724f77f..b6efd2e1e55b 100644 --- a/x11-wm/ede/Makefile +++ b/x11-wm/ede/Makefile @@ -7,9 +7,9 @@ PORTNAME= ede PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ede +MASTER_SITES= SF MAINTAINER= sem@FreeBSD.org COMMENT= Equinox Desktop Environment @@ -18,7 +18,7 @@ LIB_DEPENDS= efltk.2:${PORTSDIR}/x11-toolkits/efltk WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS}" diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index 3bcd63febfbb..eba21799ecf9 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -32,8 +32,8 @@ MAN1= emerald.1 \ emerald-theme-manager.1 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" # XXX - might want to change that post-patch: diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile index c1d98985a806..2727914d0a3a 100644 --- a/x11-wm/enlightenment-docs/Makefile +++ b/x11-wm/enlightenment-docs/Makefile @@ -7,18 +7,17 @@ PORTNAME= enlightenment-docs PORTVERSION= 0.16.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= enlightenment +MASTER_SITES= SF DISTNAME= e16-docs-${PORTVERSION}-0.02 MAINTAINER= vanilla@FreeBSD.org COMMENT= Data files of enlightenment DOX -RUN_DEPENDS= ${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment +RUN_DEPENDS= ${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment -USE_X_PREFIX= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index a2f8d56b53f2..b0f17f21d7de 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -7,29 +7,25 @@ PORTNAME= enlightenment PORTVERSION= 0.16.8.13 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= e16-${PORTVERSION}-0.01 MAINTAINER= vanilla@FreeBSD.org COMMENT= A very artistic X window manager -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - DATADIR= ${PREFIX}/share/e16 -USE_X_PREFIX= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xft x11 USE_ICONV= yes USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --disable-esdtest --disable-dependency-tracking \ --disable-rpath -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if !defined(WITHOUT_ESOUND) USE_GNOME= esound diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile index 593c5bd88a4f..47a673a249bf 100644 --- a/x11-wm/epiwm/Makefile +++ b/x11-wm/epiwm/Makefile @@ -7,13 +7,14 @@ PORTNAME= epiwm PORTVERSION= 0.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.nongnu.org/epiwm/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Another fast, small, configurable window manager +USE_XORG= x11 xpm USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile index 37db5edb6185..677b0c62539f 100644 --- a/x11-wm/evilwm/Makefile +++ b/x11-wm/evilwm/Makefile @@ -23,8 +23,8 @@ PLIST_FILES= bin/evilwm CFLAGS+= -DSOLIDDRAG -DINFOBANNER -DVWM -DSHAPE -DMOUSE -DSNAP \ -DSTDIO -DCOLOURMAP -DVERSION=\\\"${PORTVERSION}\\\" \ - -I${X11BASE}/include -LDFLAGS= -L${X11BASE}/lib -lX11 -lXext + -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib -lX11 -lXext do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile index 2638e4fa0396..e7500fb52413 100644 --- a/x11-wm/expocity/Makefile +++ b/x11-wm/expocity/Makefile @@ -7,7 +7,7 @@ PORTNAME= expocity PORTVERSION= 2.6.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm MASTER_SITES= http://www.pycage.de/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -20,14 +20,14 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFLICTS= metacity* USE_BZIP2= yes -USE_X_PREFIX= yes +USE_X11= x11 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix gnomehack gnomehier gconf2 libglade2 GCONF_SCHEMAS= metacity.schemas USE_GETTEXT= yes USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile index 0405e4e8352c..2fc9ecf13c90 100644 --- a/x11-wm/fbcmd/Makefile +++ b/x11-wm/fbcmd/Makefile @@ -25,7 +25,7 @@ USE_XORG= x11 xmu PLIST_FILES= bin/fbcmd post-extract: - @${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fbcmd ${PREFIX}/bin diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile index f33790591794..c30929601032 100644 --- a/x11-wm/fluxspace/Makefile +++ b/x11-wm/fluxspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= fluxspace PORTVERSION= 0.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= SF @@ -18,7 +18,7 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 BROKEN= Checksum mismatch -USE_XLIB= yes +USE_XORG= x11 USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 @@ -29,7 +29,7 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> -.if defined(WITH_IDESK) || exists(${X11BASE}/bin/idesk) +.if defined(WITH_IDESK) || exists(${LOCALBASE}/bin/idesk) RUN_DEPENDS+= idesk:${PORTSDIR}/x11/idesk .endif .if defined(WITH_ROX-FILER) || exists(${LOCALBASE}/bin/rox) diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile index ac39ccfbb569..3cb56191423c 100644 --- a/x11-wm/fluxter/Makefile +++ b/x11-wm/fluxter/Makefile @@ -7,14 +7,14 @@ PORTNAME= fluxter PORTVERSION= 0.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://benedict.isomedia.com/homes/stevencooper/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Desktop pager for the Fluxbox Slit -USE_X_PREFIX= yes +USE_XORG= x11 ice xproto xt xaw xext GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index c6fbb78d2519..2a8ab57a8df6 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -7,9 +7,9 @@ PORTNAME= fvwm95-i18n PORTVERSION= 2.0.43a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= fvwm95 DISTNAME= fvwm95-2.0.43a-Autoconf DISTFILES= ${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz @@ -23,14 +23,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Win95 lookalike fvwm2 window manager with an I18N patch LIB_DEPENDS= rplay.1:${PORTSDIR}/audio/rplay -RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons +RUN_DEPENDS= ${LOCALBASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons EXTRACT_ONLY= ${DISTNAME}.tgz ${PORTNAME}-${PORTVERSION}-portKit-19981123.tgz -USE_X_PREFIX= yes -USE_XPM= yes -USE_XORG= xbitmaps + +USE_XORG= xbitmaps x11 xpm xmu xext GNU_CONFIGURE= yes -CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ +CONFIGURE_ARGS= --x-includes=${LOCALBASE}/include \ --includedir=${LOCALBASE}/include --libdir=${LOCALBASE}/lib CONFIGURE_ENV= INSTALL_MAN="${INSTALL_MAN}" MAN1= fvwm95.1 xpmroot.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile index a42f17b1e446..ad330eabb35b 100644 --- a/x11-wm/fvwm95/Makefile +++ b/x11-wm/fvwm95/Makefile @@ -7,10 +7,9 @@ PORTNAME= fvwm95 PORTVERSION= 2.0.43a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-Autoconf EXTRACT_SUFX= .tgz @@ -18,11 +17,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Win95 lookalike version of the fvwm2 window manager LIB_DEPENDS= rplay.1:${PORTSDIR}/audio/rplay -RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons +RUN_DEPENDS= ${LOCALBASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons -USE_X_PREFIX= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps x11 xpm xmu xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \ --libdir=${LOCALBASE}/lib diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile index bd42ec6a2beb..a71b1acfaf15 100644 --- a/x11-wm/golem/Makefile +++ b/x11-wm/golem/Makefile @@ -7,10 +7,9 @@ PORTNAME= golem PORTVERSION= 0.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Small window manager with themes and plugins @@ -23,14 +22,14 @@ PLIST_SUB+= NO_SOUND="" PLIST_SUB+= NO_SOUND="@comment " .endif +USE_XORG= x11 xext xpm +GNU_CONFIGURE= yes + .if defined(WANT_XINERAMA) CONFIGURE_ARGS+= --enable-xinerama +USE_XORG+= xinerama .endif -USE_X_PREFIX= yes -USE_XPM= yes -GNU_CONFIGURE= yes - MANCOMPRESSED= yes MAN1= golem.1 diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile index a1855dd09cb9..62f16ea019f2 100644 --- a/x11-wm/gwm/Makefile +++ b/x11-wm/gwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwm PORTVERSION= 1.8d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://koala.ilog.fr/ftp/pub/gwm/ EXTRACT_SUFX= .tgz @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generic Window Manager USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= gwm.1 DEPRECATED= Project is dead diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index 505fd8a35e37..651f6dc75560 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -19,7 +20,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= xmonad:${PORTSDIR}/x11-wm/xmonad LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index a5fd4b2b4f91..7a317d8f0b61 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ @@ -17,7 +18,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index cfb57314069e..d0ddaaa33607 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -7,6 +7,7 @@ PORTNAME= icewm PORTVERSION= 1.2.35 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= SF @@ -14,6 +15,7 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Window Manager designed for speed, usability and consistency WANT_GNOME= yes +USE_XORG= x11 ice xinerama xext USE_GNOME= gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile index 7f140e932064..6c07b8f32aff 100644 --- a/x11-wm/ion-2/Makefile +++ b/x11-wm/ion-2/Makefile @@ -8,7 +8,7 @@ PORTNAME= ion-2 PORTVERSION= 20040729 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ @@ -17,7 +17,7 @@ COMMENT= A tiling tabbed window manager CONFLICTS= ion-2002* ion-devel-* pwm-* -USE_X_PREFIX= yes +USE_XORG= x11 xext xinerama USE_AUTOTOOLS= libtool:15 libltdl:15 USE_LUA= 5.0 USE_GMAKE= yes diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk index 80061f5ff69e..a9391de7a127 100644 --- a/x11-wm/ion-2/files/patch-system.mk +++ b/x11-wm/ion-2/files/patch-system.mk @@ -55,7 +55,7 @@ ## -X11_PREFIX=/usr/X11R6 -+X11_PREFIX=$(X11BASE) ++X11_PREFIX=$(LOCALBASE) # SunOS/Solaris #X11_PREFIX=/usr/openwin diff --git a/x11-wm/ion/files/patch-system.mk b/x11-wm/ion/files/patch-system.mk index e08a035fd705..bee9da4e1b88 100644 --- a/x11-wm/ion/files/patch-system.mk +++ b/x11-wm/ion/files/patch-system.mk @@ -29,7 +29,7 @@ ## -X11_PREFIX=/usr/X11R6 -+X11_PREFIX=$(X11BASE) ++X11_PREFIX=$(LOCALBASE) # SunOS/Solaris #X11_PREFIX=/usr/openwin diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile index 44aacfab0ac8..12d31f855b6c 100644 --- a/x11-wm/jewel/Makefile +++ b/x11-wm/jewel/Makefile @@ -26,7 +26,7 @@ post-patch: s|^CFLAGS|#CFLAGS|g; \ s|^prefix|#prefix|g; \ s|prefix|PREFIX|g; \ - s|/usr/X11R6|${X11BASE}|g; \ + s|/usr/X11R6|${LOCALBASE}|g; \ s|CC|CXX|g; \ s|CFLAGS|CXXFLAGS|g' \ ${WRKSRC}/Makefile diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile index 7772244d79d5..473d9d2392d9 100644 --- a/x11-wm/jwm/Makefile +++ b/x11-wm/jwm/Makefile @@ -21,9 +21,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_XORG= xpm GNU_CONFIGURE= yes USE_BZIP2= yes -CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= jwm.1 diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile index bd21e9fbc130..ee6cf2f55f0a 100644 --- a/x11-wm/kahakai/Makefile +++ b/x11-wm/kahakai/Makefile @@ -7,19 +7,16 @@ PORTNAME= kahakai PORTVERSION= 0.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= xcas@cox.net COMMENT= Kahakai window manager BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \ - ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -RUN_DEPENDS= \ - ${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts + ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost +RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts BROKEN= Does not compile @@ -28,6 +25,7 @@ DEPRECATED= "Development ceased" USE_AUTOTOOLS= libtool:15 USE_PERL5_BUILD=yes USE_BZIP2= yes +USE_XORG= x11 xft USE_GMAKE= yes GNU_CONFIGURE= yes USE_PYTHON= yes @@ -37,9 +35,9 @@ USE_EFL= imlib2 MAN1= kahakai.1 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CFLAGS=${PTHREAD_CFLAGS} \ - LDFLAGS=-L${X11BASE}/lib \ + LDFLAGS=-L${LOCALBASE}/lib \ LIBS=${PTHREAD_LIBS} .include <bsd.port.pre.mk> @@ -49,7 +47,7 @@ BROKEN= "Does not compile on alpha 4.x" .endif post-patch: - @${REINPLACE_CMD} -e 's|/tmp/ktest|${X11BASE}|' \ + @${REINPLACE_CMD} -e 's|/tmp/ktest|${LOCALBASE}|' \ ${WRKSRC}/data/styles/Default.kastyle.in @${REINPLACE_CMD} -e 's|bool max|bool wmax|' \ ${WRKSRC}/src/Window.hh diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile index 6a5305cee8dd..e1920068665b 100644 --- a/x11-wm/kompmgr/Makefile +++ b/x11-wm/kompmgr/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= bin/kompmgr do-build: cd ${WRKSRC}/kwin/kompmgr && \ - ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib -lX11 -lXdamage\ + ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -lXdamage\ -lXfixes -lXrender -lXcomposite -lm -o kompmgr kompmgr.c do-install: diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile index 7c58cc97ced5..8c017d954737 100644 --- a/x11-wm/libcompizconfig/Makefile +++ b/x11-wm/libcompizconfig/Makefile @@ -25,8 +25,8 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack intltool libxml2 CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile index 6d32099ae804..6ca92bd2cd24 100644 --- a/x11-wm/libdockapp/Makefile +++ b/x11-wm/libdockapp/Makefile @@ -7,7 +7,7 @@ PORTNAME= libdockapp PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/ @@ -18,12 +18,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/^lib//}-${PORTVERSION} USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xext xpm GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --without-font --without-examples -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 28669172fa31..b25287512430 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -8,6 +8,7 @@ PORTNAME= metacity PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,8 +21,8 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFLICTS= expocity-[0-9]* USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes +USE_XORG= x11 xcomposite xdamage USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20 diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile index 9e521161e7fc..3c521cef1df1 100644 --- a/x11-wm/mlvwm/Makefile +++ b/x11-wm/mlvwm/Makefile @@ -22,7 +22,7 @@ EXPIRATION_DATE= 2007-10-28 USE_IMAKE= yes USE_PERL5_BUILD=yes -USE_XPM= yes +USE_XORG= xpm MAN1= mlvwm.1 MLVWMLIBDIR= ${PREFIX}/lib/X11/mlvwm diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile index 9e5e0238b0c2..f99d4de7f8f3 100644 --- a/x11-wm/novawm/Makefile +++ b/x11-wm/novawm/Makefile @@ -7,23 +7,21 @@ PORTNAME= novawm PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= NovaWM-${PORTVERSION}_alpha MAINTAINER= ports@FreeBSD.org COMMENT= A window manager for X, developed with speed, size, and style in mind USE_BZIP2= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xpm USE_GMAKE= yes GNU_CONFIGURE= yes -MAKE_ARGS= INCLUDES=-I${X11BASE}/include \ +MAKE_ARGS= INCLUDES=-I${LOCALBASE}/include \ CXXFLAGS="${CXXFLAGS} -D_WIN_GNOME_SUPPORT" \ - novawm_LDFLAGS=-L${X11BASE}/lib + novawm_LDFLAGS=-L${LOCALBASE}/lib PLIST_FILES= bin/novawm .if !defined(NOPORTDOCS) diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile index 96ece32dc424..6f711f183ea7 100644 --- a/x11-wm/olvwm/Makefile +++ b/x11-wm/olvwm/Makefile @@ -28,7 +28,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview REINPLACE_ARGS= -i "" NO_WRKSUBDIR= yes USE_IMAKE= yes -USE_XPM= yes +USE_XORG= xpm MAN1= olvwm.1 olvwmrc.1 XFREE86_HTML_MAN= no diff --git a/x11-wm/orion/Makefile b/x11-wm/orion/Makefile index f40f72485986..510372fc1f43 100644 --- a/x11-wm/orion/Makefile +++ b/x11-wm/orion/Makefile @@ -7,7 +7,7 @@ PORTNAME= orion PORTVERSION= 0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm scheme MASTER_SITES= ftp://ftp.scsh.net/pub/scsh/packages/orion-wm/ @@ -17,8 +17,8 @@ COMMENT= An X11 window manager written in Scheme RUN_DEPENDS= ${LOCALBASE}/lib/scsh/0.6/module-system:${PORTSDIR}/devel/sunterlib \ ${LOCALBASE}/lib/scsh/0.6/scx:${PORTSDIR}/x11-toolkits/scx -USE_X_PREFIX= yes NO_BUILD= yes +USE_XORG= x11 DEPRECATED= Version branch long since retired EXPIRATION_DATE= 2007-10-28 diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile index 5a20c65442d2..74088350b838 100644 --- a/x11-wm/pager/Makefile +++ b/x11-wm/pager/Makefile @@ -7,7 +7,7 @@ PORTNAME= pager PORTVERSION= 0.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ http://mirror2.unixfreunde.de/ @@ -21,7 +21,7 @@ RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish USE_GMAKE= yes MAKEFILE= GNUmakefile -USE_XLIB= yes +USE_XORG= x11 SAWFISH_VERSION= `${LOCALBASE}/bin/sawfish --version 2>&1 | \ ${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'` diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile index a432c9ad73e2..98d67c26f571 100644 --- a/x11-wm/pawm/Makefile +++ b/x11-wm/pawm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pawm PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.pleyades.net/pawm/files/ @@ -15,14 +15,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Puto Amo Window Manager USE_BZIP2= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xrandr xrender xpm USE_GMAKE= yes MAKEFILE= Makefile.in MAKE_ARGS= GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o" -CFLAGS+= -I. -I${X11BASE}/include -DNDEBUG -LDFLAGS= -lm -L${X11BASE}/lib -lXpm +CFLAGS+= -I. -I${LOCALBASE}/include -DNDEBUG +LDFLAGS= -lm -L${LOCALBASE}/lib -lXpm .include <bsd.port.pre.mk> diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile index 07297689d306..ab6b54144543 100644 --- a/x11-wm/peksystray/Makefile +++ b/x11-wm/peksystray/Makefile @@ -7,16 +7,15 @@ PORTNAME= peksystray PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A system tray dockapp similar to the GNOME notification area applet USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= x11 ice sm USE_GNOME= gnometarget GNU_CONFIGURE= yes diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 902a574b31ee..a813dacb2e32 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pekwm PORTVERSION= 20060417 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://bsd-unix.org/downloads/ \ http://pekwm.org/files/ @@ -16,15 +16,13 @@ DISTNAME= ${PORTNAME}-0.1.5 MAINTAINER= xcas@cox.net COMMENT= A windowmanager based on aewm++ -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GCC= 3.4 USE_GMAKE= yes -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xft xpm x11 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile index d4d6f4f75042..109135ebed4e 100644 --- a/x11-wm/phluid/Makefile +++ b/x11-wm/phluid/Makefile @@ -7,19 +7,17 @@ PORTNAME= phluid PORTVERSION= 0.0.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= phluid +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A window manager that emphasizes efficiency, speed, and beauty -USE_X_PREFIX= yes USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lm" .include <bsd.port.mk> diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile index 0110cfdedcf4..047c9ca63e28 100644 --- a/x11-wm/piewm/Makefile +++ b/x11-wm/piewm/Makefile @@ -7,7 +7,7 @@ PORTNAME= piewm PORTVERSION= 1.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.crynwr.com/piewm/ @@ -16,8 +16,7 @@ COMMENT= A tvtwm with pie (circular) menus DISABLE_SIZE= yes USE_IMAKE= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xpm MAN1= piewm.1 .include <bsd.port.mk> diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile index 9e6373e1e9e1..07c94978d213 100644 --- a/x11-wm/pwm/Makefile +++ b/x11-wm/pwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= pwm PORTVERSION= 2007.07.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ \ http://schot.a-eskwadraat.nl/files/ @@ -18,7 +18,7 @@ COMMENT= A lightweight window manager with emphasis on usability USE_XORG= x11 USE_GMAKE= yes -MAKE_ENV= X11_PREFIX="${X11BASE}" HAS_SYSTEM_ASPRINTF=1 +MAKE_ENV= X11_PREFIX="${LOCALBASE}" HAS_SYSTEM_ASPRINTF=1 MAN1= pwm.1x diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile index 36750c02c204..30f33e79b8c7 100644 --- a/x11-wm/qvwm/Makefile +++ b/x11-wm/qvwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= qvwm PORTVERSION= 1.1.12 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \ ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/ @@ -15,9 +15,8 @@ MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Windows 95/98/NT like window manager for X11 -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xpm xscrnsaver USE_GNOME= esound imlib -USE_XPM= yes GNU_CONFIGURE= yes MAN1= qvwm.1x diff --git a/x11-wm/ratmen/files/patch-Makefile b/x11-wm/ratmen/files/patch-Makefile index 9bd308ca0281..771898cf41ad 100644 --- a/x11-wm/ratmen/files/patch-Makefile +++ b/x11-wm/ratmen/files/patch-Makefile @@ -17,8 +17,8 @@ -LIBS = -L/usr/X11R6/lib -lX11 -CFLAGS = $(OPTIMIZE) $(WARN) $(DEBUG) +CC ?= gcc -+LIBS = -L$(X11BASE)/lib -lX11 -+CFLAGS += $(OPTIMIZE) $(WARN) $(DEBUG) -I$(X11BASE)/include ++LIBS = -L$(LOCALBASE)/lib -lX11 ++CFLAGS += $(OPTIMIZE) $(WARN) $(DEBUG) -I$(LOCALBASE)/include all: doc $(PROG) diff --git a/x11-wm/ratmenu/files/patch-Makefile b/x11-wm/ratmenu/files/patch-Makefile index 31b5a8b0cb16..6b18c3c79b0b 100644 --- a/x11-wm/ratmenu/files/patch-Makefile +++ b/x11-wm/ratmenu/files/patch-Makefile @@ -11,8 +11,8 @@ -LIBS = -L/usr/X11R6/lib -lX11 -CFLAGS = -Os -Wall -ansi -pedantic +MANDIR = $(PREFIX)/man -+CFLAGS += -I$(X11BASE)/include -+LIBS = -L$(X11BASE)/lib -lX11 ++CFLAGS += -I$(LOCALBASE)/include ++LIBS = -L$(LOCALBASE)/lib -lX11 $(PROG): $(PROG).c $(CC) $(CFLAGS) $< $(LIBS) -o $@ diff --git a/x11-wm/sapphire/files/patch-Makefile b/x11-wm/sapphire/files/patch-Makefile index 8be0b035b5b8..15cea151ed9a 100644 --- a/x11-wm/sapphire/files/patch-Makefile +++ b/x11-wm/sapphire/files/patch-Makefile @@ -12,7 +12,7 @@ -prefix = /usr -XROOT = $(prefix)/X11R6 +prefix = ${PREFIX} -+XROOT = ${X11BASE} ++XROOT = ${LOCALBASE} DESTDIR = INCLUDES = -I$(XROOT)/include LDPATH = -L$(XROOT)/lib diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 1312f214fab5..08511f570cf1 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -8,6 +8,7 @@ PORTNAME= sawfish PORTVERSION= 1.3.3 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= x11-wm MASTER_SITES= SF @@ -24,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x1 GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//} PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION} -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes USE_GNOME= gnomehier gnomehack esound USE_AUTOTOOLS= autoconf:261:env automake:19:env libtool:15:env diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile index 337cb8d23da3..670bdf238b33 100644 --- a/x11-wm/skippy-xd/Makefile +++ b/x11-wm/skippy-xd/Makefile @@ -25,7 +25,7 @@ PLIST_DIRS= %%DATADIR%% PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \ s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \ ${WRKSRC}/Makefile post-build: diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile index 6c9c07bb5d5e..950e91788718 100644 --- a/x11-wm/skippy/Makefile +++ b/x11-wm/skippy/Makefile @@ -7,16 +7,14 @@ PORTNAME= skippy PORTVERSION= 0.5.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= http://thegraveyard.org/files/ MAINTAINER= ports@FreeBSD.org COMMENT= A full-screen X11 task-switcher like Apple's Expose -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft - -USE_XLIB= yes +USE_XORG= x11 xext xinerama xft xmu USE_BZIP2= yes USE_GNOME= pkgconfig USE_EFL= imlib2 @@ -26,7 +24,7 @@ PLIST_DIRS= %%DATADIR%% PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|; \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \ s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \ ${WRKSRC}/Makefile post-build: diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile index 1a880d23b425..a43d3727eb10 100644 --- a/x11-wm/swm/Makefile +++ b/x11-wm/swm/Makefile @@ -7,13 +7,13 @@ PORTNAME= swm PORTVERSION= 1.3.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://www2.informatik.hu-berlin.de/~sperling/prog/ EXTRACT_SUFX= c-src.tgz MAINTAINER= ports@FreeBSD.org -COMMENT=Window manager for low-memory systems, with title bars and shading +COMMENT= Window manager for low-memory systems, with title bars and shading BINS= swm swmbg swmswitch DOCDIR= share/doc/${PORTNAME} @@ -23,8 +23,7 @@ PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= share/swm/pixmaps share/swm SCRIPTS= startswm USE_GMAKE= yes -USE_XPM= yes -USE_X_PREFIX= yes +USE_XORG= x11 xext xpm WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src post-patch: @@ -35,10 +34,10 @@ post-patch: .endfor post-build: - cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \ - -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${X11BASE}/lib - cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \ - -o ${WRKSRC}/swmswitch -lX11 -L${X11BASE}/lib + cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \ + -o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${LOCALBASE}/lib + cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \ + -o ${WRKSRC}/swmswitch -lX11 -L${LOCALBASE}/lib pre-install: ${RM} -f ${PLIST} diff --git a/x11-wm/swm/files/patch-Makefile-xpm b/x11-wm/swm/files/patch-Makefile-xpm index 68d8f4f46fe5..96ec2be6ea5b 100644 --- a/x11-wm/swm/files/patch-Makefile-xpm +++ b/x11-wm/swm/files/patch-Makefile-xpm @@ -17,7 +17,7 @@ +#CC = gcc -XROOT = /usr/X11R6 -+XROOT = $(X11BASE) ++XROOT = $(LOCALBASE) INCLPATH = -I$(XROOT)/include LDPATH = -L$(XROOT)/lib diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile index b6952647cb49..2aa85bf62c75 100644 --- a/x11-wm/treewm/Makefile +++ b/x11-wm/treewm/Makefile @@ -7,26 +7,25 @@ PORTNAME= treewm PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Window Manager that arranges the windows in a tree -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake USE_BZIP2= yes USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xmu xpm xt xxf86vm PKGMESSAGE= ${WRKDIR}/pkg-message PORTDOCS= AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO default.cfg sample.cfg post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile post-build: @${SED} 's|%%D%%|${DOCSDIR}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE} diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile index 48732b78a7a5..573cd140ec57 100644 --- a/x11-wm/tvtwm/Makefile +++ b/x11-wm/tvtwm/Makefile @@ -18,8 +18,7 @@ COMMENT= Twm with a virtual desktop WRKSRC= ${WRKDIR}/tvtwm USE_IMAKE= yes -USE_XPM= yes -USE_XORG= xbitmaps +USE_XORG= xbitmaps xpm MAN1= tvtwm.1 MANCOMPRESSED= no PLIST_FILES= bin/tvtwm diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile index 56ae1d7bd445..61c56c4d8d47 100644 --- a/x11-wm/ude/Makefile +++ b/x11-wm/ude/Makefile @@ -7,9 +7,9 @@ PORTNAME= ude PORTVERSION= 0.2.9b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= udeproject MAINTAINER= ports@FreeBSD.org @@ -17,8 +17,7 @@ COMMENT= Small, fast, compact windowmanager LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 ice sm xext xmu xpm GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile index 93e376e86f49..beec3e3390d2 100644 --- a/x11-wm/waimea-devel/Makefile +++ b/x11-wm/waimea-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= waimea PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://dev.gentoo.org/~nixphoeni/ \ ${MASTER_SITE_LOCAL} @@ -24,7 +24,7 @@ LATEST_LINK= ${PORTNAME}-devel USE_AUTOTOOLS= automake:19:env USE_GMAKE= yes USE_ICONV= yes -USE_X_PREFIX= yes +USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile index 4061481c1a01..65ed428d082c 100644 --- a/x11-wm/waimea/Makefile +++ b/x11-wm/waimea/Makefile @@ -7,19 +7,17 @@ PORTNAME= waimea PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= waimea +MASTER_SITES= SF MAINTAINER= danfe@FreeBSD.org COMMENT= An X11 window manager designed for maximum efficiency -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft RUN_DEPENDS= ${LOCALBASE}/bin/Esetroot:${PORTSDIR}/x11/eterm USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XORG= xft USE_PERL5_RUN= yes GNU_CONFIGURE= yes diff --git a/x11-wm/wampager/Makefile b/x11-wm/wampager/Makefile index 416e64cf70b5..8f6c89aa57bd 100644 --- a/x11-wm/wampager/Makefile +++ b/x11-wm/wampager/Makefile @@ -7,7 +7,7 @@ PORTNAME= wampager PORTVERSION= 0.9.3.20041204 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.ijs.si/~lesi/waimea/ \ http://www.daemon.li/distfiles/ @@ -17,8 +17,8 @@ COMMENT= A mini pager for the waimea window manager PLIST_FILES= bin/wampager +USE_XORG= x11 xext xpm ice USE_BZIP2= yes GNU_CONFIGURE= yes -USE_X_PREFIX= yes .include <bsd.port.mk> diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile index 79a5f3c82069..de3e7232fcfb 100644 --- a/x11-wm/weewm/Makefile +++ b/x11-wm/weewm/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/weewm USE_XORG= x11 post-patch: - @${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/src/Makefile do-install: diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile index c0e21ee1bad5..0983ddcfa358 100644 --- a/x11-wm/windowlab/Makefile +++ b/x11-wm/windowlab/Makefile @@ -29,7 +29,7 @@ PORTDOCS= CHANGELOG README post-patch: @${REINPLACE_CMD} -e 's,^CC =,CC ?=,' \ - -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile + -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/windowlab ${PREFIX}/bin diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index bcf1d092b72f..637b449e1bd3 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft -RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons +RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile index 8ad102ee0c3b..1ce20a00caa6 100644 --- a/x11-wm/wm2/Makefile +++ b/x11-wm/wm2/Makefile @@ -7,7 +7,7 @@ PORTNAME= wm2 PORTVERSION= 4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://www.all-day-breakfast.com/wm2/ DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -15,9 +15,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= A very simple window manager for X -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend -USE_X_PREFIX= yes +USE_XORG= x11 xext xmu ALL_TARGET= depend wm2 do-install: diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa index a9e723ad4b0c..819ef9e6114c 100644 --- a/x11-wm/wm2/files/patch-aa +++ b/x11-wm/wm2/files/patch-aa @@ -3,7 +3,7 @@ @@ -1,9 +1,10 @@ -LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm -+LIBS = -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm ++LIBS = -L$(LOCALBASE)/lib -lXext -lX11 -lXmu -lm +LIBS += -Wl,-rpath,$(PREFIX)/lib -CC = gcc @@ -11,7 +11,7 @@ -CFLAGS = -O2 +CC ?= gcc +CCC = $(CXX) -+CFLAGS += -I$(PREFIX)/include ++CFLAGS += -I$(LOCALBASE)/include OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o .c.o: diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index 58383397bb6c..e62e271cadbe 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -39,7 +39,7 @@ post-patch: @${REINPLACE_CMD} -e '/chmod 0/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E '/\/usr\/share/d; \ s|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g; \ + s|/usr/X11R6|${LOCALBASE}|g; \ s|(share/pixmaps.*),|\1|g' \ ${WRKSRC}/data/WMWmakerconf* .for file in data/po/ja.po po/ja.po diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile index d910165c2b01..09fc45e04a9f 100644 --- a/x11-wm/wmanager/Makefile +++ b/x11-wm/wmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmanager PORTVERSION= 0.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION}.orig @@ -19,7 +19,8 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_X_PREFIX= yes +USE_XORG= x11 xext +USE_GL= gl USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa index 25944fb2ab25..982b0eddc1c0 100644 --- a/x11-wm/wmanager/files/patch-aa +++ b/x11-wm/wmanager/files/patch-aa @@ -11,8 +11,8 @@ $FreeBSD$ +bindir = $(PREFIX)/bin +incdir = ./inc +srcdir = ./src -+fltkinc = $(X11BASE)/include -+x11lib = $(X11BASE)/lib ++fltkinc = $(LOCALBASE)/include ++x11lib = $(LOCALBASE)/lib # compiler settings -CXX = g++ diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile index e5a1a30e001c..56c374854cdb 100644 --- a/x11-wm/wmcp/Makefile +++ b/x11-wm/wmcp/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmcp PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/ @@ -15,8 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A dockable pager for Window Maker PLIST_FILES= bin/wmcp -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= x11 xext xpm ALL_TARGET= clean wmcp do-install: diff --git a/x11-wm/wmcp/files/patch-aa b/x11-wm/wmcp/files/patch-aa index 5465a9235164..4069cab7c087 100644 --- a/x11-wm/wmcp/files/patch-aa +++ b/x11-wm/wmcp/files/patch-aa @@ -5,8 +5,8 @@ -INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11 -LIBINC =-L/usr/X11R6/lib -L/usr/include/lib -+INCLUDES = -I${X11BASE}/include/X11 -I${X11BASE}/include -+LIBINC = -L${X11BASE}/lib ++INCLUDES = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include ++LIBINC = -L${LOCALBASE}/lib LIBS = -lm -lX11 -lXpm -lXext TARGET = wmcp diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile index 3635142cd74a..3f2ebaff75c0 100644 --- a/x11-wm/wmg/Makefile +++ b/x11-wm/wmg/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmg PORTVERSION= 0.15.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm gnome MASTER_SITES= http://ductape.net/~reeve/downloads/ DISTNAME= wmG-${PORTVERSION} @@ -15,8 +15,7 @@ DISTNAME= wmG-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Small GTK-based GNOME-compliant window manager -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile index e18ae5119100..1edc2d48a485 100644 --- a/x11-wm/wmii/Makefile +++ b/x11-wm/wmii/Makefile @@ -7,6 +7,7 @@ PORTNAME= wmii DISTVERSION= 3.6 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://www.suckless.org/download/ @@ -18,10 +19,10 @@ RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu \ ${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base USE_ICONV= yes -USE_XLIB= yes +USE_XORG= x11 xextproto xt xext MAKE_ARGS= PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \ - INCX11="-I${X11BASE}/include" LIBX11="-L${X11BASE}/lib" \ + INCX11="-I${LOCALBASE}/include" LIBX11="-L${LOCALBASE}/lib" \ CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \ LIBICONV="-liconv" MAN="${MANPREFIX}/man" diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index ba10407ebd7e..2cda5526cc7f 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -7,14 +7,14 @@ PORTNAME= xcompmgr PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://xapps.freedesktop.org/release/ MAINTAINER= anholt@FreeBSD.org COMMENT= A sample X compositing manager -USE_XLIB= yes +USE_XORG= x11 xcomposite xfixes xdamage xrender GNU_CONFIGURE= yes MAN1= xcompmgr.1 diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index cffcab261228..afd479cb3153 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -7,10 +7,9 @@ PORTNAME= xfce PORTVERSION= 3.8.18 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm xfce -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= oliver@FreeBSD.org COMMENT= CDE like desktop with GTK @@ -18,7 +17,7 @@ COMMENT= CDE like desktop with GTK LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_GCC= 4.1 -USE_XORG= x11 +USE_XORG= x11 xpm USE_GETTEXT= yes USE_GNOME= gdkpixbuf GNU_CONFIGURE= yes @@ -28,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \ --with-data-dir=${PREFIX}/share/xfce \ --with-locale-dir=${PREFIX}/share/locale \ - --with-xpm=${X11BASE} \ + --with-xpm=${LOCALBASE} \ --enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \ --disable-arts \ --enable-taskbar \ @@ -43,13 +42,13 @@ MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \ .include <bsd.port.pre.mk> .if defined(WITH_XFT) -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft +USE_XORG= xft CONFIGURE_ARGS+= --enable-xft .endif post-patch: @${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c @${REINPLACE_CMD} -e 's|/opt/kde3|${LOCALBASE}|g ; \ s|/opt/gnome|${LOCALBASE}|g' ${WRKSRC}/xfmenu/xfmenu.c diff --git a/x11-wm/xfce/files/patch-other::xinitrc.in b/x11-wm/xfce/files/patch-other::xinitrc.in index 75df757baabd..66f1710673f6 100644 --- a/x11-wm/xfce/files/patch-other::xinitrc.in +++ b/x11-wm/xfce/files/patch-other::xinitrc.in @@ -5,7 +5,7 @@ # Launch xscreensaver (if available) -xscreensaver -no-splash & -+XBINDIR=%%X11BASE%%/bin ++XBINDIR=%%LOCALBASE%%/bin +if [ -x $XBINDIR/xscreensaver ]; then + xscreensaver -no-splash & +fi diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 1fe745504309..392ad280adb9 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.4.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -26,6 +26,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes USE_XFCE= configenv libgui libmcs libutil mcsmanager +USE_XORG= x11 sm ice MAN1= xfce4-session.1 xfce4-session-logout.1 diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile index 505fd8a35e37..651f6dc75560 100644 --- a/x11-wm/xmonad-contrib/Makefile +++ b/x11-wm/xmonad-contrib/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -19,7 +20,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ RUN_DEPENDS= xmonad:${PORTSDIR}/x11-wm/xmonad LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile index a5fd4b2b4f91..7a317d8f0b61 100644 --- a/x11-wm/xmonad/Makefile +++ b/x11-wm/xmonad/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ @@ -17,7 +18,7 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 -USE_XLIB= yes +USE_XORG= x11 CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.2 diff --git a/x11-wm/yawm/Makefile b/x11-wm/yawm/Makefile index 2e01528776b8..87c7a2d49290 100644 --- a/x11-wm/yawm/Makefile +++ b/x11-wm/yawm/Makefile @@ -7,7 +7,7 @@ PORTNAME= yawm PORTVERSION= 0.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.sai.msu.su/pub/X11/win_man/ DISTNAME= yawm-0.0.1-a4 @@ -18,7 +18,7 @@ COMMENT= Has title bars, iconizing, maximizing, taskbar, placement, clock GNU_CONFIGURE= yes PLIST= ${WRKDIR}/pkg-plist #USE_GMAKE= yes -USE_X_PREFIX= yes +USE_XORG= x11 DOCS= AUTHORS COPYING ChangeLog DEPRECATED= project no longer exists |