aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-04-19 17:56:05 +0000
commit3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
treed573ea09b2bf6be67cb497df199932da9e2707c4 /editors
parent40049f4af2200d0dcf33596508688623fc75f764 (diff)
downloadports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz
ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/bed/Makefile2
-rw-r--r--editors/bitmap/Makefile2
-rw-r--r--editors/color-mate/Makefile2
-rw-r--r--editors/conglomerate/Makefile6
-rw-r--r--editors/cooledit/Makefile4
-rw-r--r--editors/dedit/Makefile3
-rw-r--r--editors/e93/Makefile2
-rw-r--r--editors/e93/files/patch-machdef.mk4
-rw-r--r--editors/edith/Makefile4
-rw-r--r--editors/elvis/Makefile8
-rw-r--r--editors/emacs/Makefile6
-rw-r--r--editors/emacs21/Makefile5
-rw-r--r--editors/emacs22/Makefile6
-rw-r--r--editors/emacs23/Makefile6
-rw-r--r--editors/fte/files/patch-aa4
-rw-r--r--editors/gedit-plugins/Makefile1
-rw-r--r--editors/gedit/Makefile2
-rw-r--r--editors/glimmer/Makefile6
-rw-r--r--editors/gnotepad+/Makefile8
-rw-r--r--editors/gnuserv/Makefile1
-rw-r--r--editors/hte/Makefile2
-rw-r--r--editors/jed/Makefile4
-rw-r--r--editors/jedit-devel/Makefile3
-rw-r--r--editors/jedit/Makefile7
-rw-r--r--editors/jext/Makefile7
-rw-r--r--editors/kxmleditor/Makefile2
-rw-r--r--editors/lazarus/Makefile2
-rw-r--r--editors/leafpad/Makefile4
-rw-r--r--editors/manedit/files/patch-Makefile.FreeBSD2
-rw-r--r--editors/manedit/files/patch-manedit.12
-rw-r--r--editors/mlview/Makefile2
-rw-r--r--editors/nedit/files/patch-aa2
-rw-r--r--editors/nedit/files/patch-ac4
-rw-r--r--editors/openoffice-3-devel/Makefile5
-rw-r--r--editors/openoffice-3-devel/files/Makefile.localized2
-rw-r--r--editors/openoffice-3/Makefile6
-rw-r--r--editors/openoffice-3/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-1.0/Makefile11
-rw-r--r--editors/openoffice.org-1.0/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile5
-rw-r--r--editors/openoffice.org-1.1-devel/files/Makefile.localized4
-rw-r--r--editors/openoffice.org-1.1/Makefile5
-rw-r--r--editors/openoffice.org-1.1/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-2-RC/Makefile5
-rw-r--r--editors/openoffice.org-2-RC/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-2-devel/Makefile5
-rw-r--r--editors/openoffice.org-2-devel/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-2/Makefile6
-rw-r--r--editors/openoffice.org-2/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-3-RC/Makefile5
-rw-r--r--editors/openoffice.org-3-RC/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-3-devel/Makefile5
-rw-r--r--editors/openoffice.org-3-devel/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-3/Makefile6
-rw-r--r--editors/openoffice.org-3/files/Makefile.localized2
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile5
-rw-r--r--editors/openoffice.org-vcltesttool/files/Makefile.localized2
-rw-r--r--editors/pdfedit/Makefile2
-rw-r--r--editors/qemacs/Makefile8
-rw-r--r--editors/richtext/files/patch-Imakefile2
-rw-r--r--editors/sam/Makefile4
-rw-r--r--editors/sam/files/patch-aa4
-rw-r--r--editors/sam/files/patch-ab2
-rw-r--r--editors/sam/files/patch-ac4
-rw-r--r--editors/setedit/Makefile6
-rw-r--r--editors/setedit/files/patch-config.pl4
-rw-r--r--editors/softmaker-office/Makefile6
-rw-r--r--editors/staroffice5/Makefile2
-rw-r--r--editors/staroffice52/Makefile2
-rw-r--r--editors/staroffice60/Makefile2
-rw-r--r--editors/staroffice70/Makefile2
-rw-r--r--editors/the/Makefile3
-rw-r--r--editors/vim/Makefile13
-rw-r--r--editors/vim5/Makefile4
-rw-r--r--editors/vim6/Makefile15
-rw-r--r--editors/wily/Makefile5
-rw-r--r--editors/xcoral/Makefile4
-rw-r--r--editors/xed/Makefile2
-rw-r--r--editors/xemacs-devel-mule/Makefile10
-rw-r--r--editors/xemacs-devel/Makefile8
-rw-r--r--editors/xemacs/Makefile5
-rw-r--r--editors/xemacs21-mule/Makefile4
-rw-r--r--editors/xenon/Makefile2
-rw-r--r--editors/xenon/files/patch-ab4
-rw-r--r--editors/xvile/Makefile4
-rw-r--r--editors/yudit/Makefile4
86 files changed, 171 insertions, 186 deletions
diff --git a/editors/bed/Makefile b/editors/bed/Makefile
index b3fae83492b1..9a8b727a4d86 100644
--- a/editors/bed/Makefile
+++ b/editors/bed/Makefile
@@ -34,7 +34,7 @@ MANCOMPRESSED= yes
# Check for menubar support in "x11/rxvt". In case of failure, disable X11 if
# BATCH or PACKAGE_BUILDING, and IGNORE otherwise.
.if !defined(WITHOUT_X11)
-. if exists(${X11BASE}/bin/rxvt)
+. if exists(${LOCALBASE}/bin/rxvt)
MENUBAR_TEST!= rxvt -h 2>&1 | ${GREP} -i menubar || ${TRUE}
. if empty(MENUBAR_TEST)
. if defined(BATCH) || defined(PACKAGE_BUILDING)
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index c7cdcdefc990..ff1513ebc8dc 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -29,7 +29,7 @@ BITMAP_DISTVER= ${BITMAP_MVER}
BITMAPDOCDIR= share/doc/bitmap
BITMAP_SETUPEL= bitmap-setupel.el
-BITMAP_FONT= ${X11BASE}/lib/X11/fonts/local/bitmap16.pcf.gz
+BITMAP_FONT= ${LOCALBASE}/lib/X11/fonts/local/bitmap16.pcf.gz
# bitmap install lispdir
BITMAP_LISPDIR?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
diff --git a/editors/color-mate/Makefile b/editors/color-mate/Makefile
index ee6db9277b2c..4072fe367ce7 100644
--- a/editors/color-mate/Makefile
+++ b/editors/color-mate/Makefile
@@ -25,7 +25,7 @@ MANIFEST= MANIFEST.color-mate
do-build:
# Create color-mate-rgb.el
cd ${WRKSRC}; \
- (${CAT} ${X11BASE}/lib/X11/rgb.txt | ${PERL5} ./rgb2el.pl > ./color-mate-rgb.el ) || ( ${ECHO} "Make rgb table from color-mate-rgb.el.std" ; ${CP} ./color-mate-rgb.el.std ./color-mate-rgb.el)
+ (${CAT} ${LOCALBASE}/lib/X11/rgb.txt | ${PERL5} ./rgb2el.pl > ./color-mate-rgb.el ) || ( ${ECHO} "Make rgb table from color-mate-rgb.el.std" ; ${CP} ./color-mate-rgb.el.std ./color-mate-rgb.el)
# Create Xresource for theme
cd ${WRKSRC}/theme; \
${SH} ${FILESDIR}/theme_build.sh
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index e352b946e091..1cebc9fd1e2e 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -6,15 +6,13 @@
PORTNAME= conglomerate
PORTVERSION= 0.9.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= GNOME2 visual XML editor with emphasis on DocBook editing
-USE_X_PREFIX= yes
INSTALLS_OMF= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui gtksourceview gnomeprefix gnomehack intlhack
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 2201f1f52b77..78bb478e9a98 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cooledit
PORTVERSION= 3.17.17
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/editors/X/cooledit
@@ -16,11 +16,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Suite of utilities, including a GUI editor
USE_AUTOTOOLS= libtool:15
-USE_XLIB= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_XORG= x11 xt
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 2ed3765aede7..72b60be33870 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dedit
PORTVERSION= 0.6.2.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -17,7 +17,6 @@ COMMENT= A simple GNOME i18n editor
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gnomelibs gnomeprefix gnomehack gtk12 glib12 orbit
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index bd4324963d1f..2e298587a89e 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -22,7 +22,7 @@ USE_TCL= yes
USE_TCL_BUILD= yes
USE_TK= yes
USE_TK_BUILD= yes
-USE_XLIB= yes
+USE_XORG= x11 xt
WRKSRC= ${WRKDIR}/${PORTNAME}
post-patch:
diff --git a/editors/e93/files/patch-machdef.mk b/editors/e93/files/patch-machdef.mk
index b4a2bf1e6597..c89e771c74e3 100644
--- a/editors/e93/files/patch-machdef.mk
+++ b/editors/e93/files/patch-machdef.mk
@@ -23,8 +23,8 @@
# files are located elsewhere on your system:
-X_INCLUDE=-I/usr/X11R6/include
-X_LIB=-L/usr/X11R6/lib
-+X_INCLUDE=-I${X11BASE}/include
-+X_LIB=-L${X11BASE}/lib
++X_INCLUDE=-I${LOCALBASE}/include
++X_LIB=-L${LOCALBASE}/lib
# if your system needs some extra libraries, add them here:
diff --git a/editors/edith/Makefile b/editors/edith/Makefile
index 26c87313f2a4..728e3c39b53a 100644
--- a/editors/edith/Makefile
+++ b/editors/edith/Makefile
@@ -7,7 +7,7 @@
PORTNAME= edith
PORTVERSION= 1.58
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors linux
MASTER_SITES= http://www.groenink.com/pub/edith/
DISTFILES= edith1.55.common.tar.gz \
@@ -18,7 +18,7 @@ COMMENT= A X11 GUI editor for binary and plain text files
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
RESTRICTED= "Redistribution not allowed"
NO_BUILD= yes
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index 9b597cc5cf0b..269a7f7e899a 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= elvis
PORTVERSION= 2.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ \
ftp://ftp.false.com/pub/elvis/ \
@@ -33,11 +33,11 @@ MAN1= elvfmt.1 elvis.1 elvtags.1 ref.1
PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS+= --without-x
.else
-USE_XPM= yes
+USE_XORG= xpm
.if defined(WITHOUT_XFT)
CONFIGURE_ARGS+= --without-xft
.else
-LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG= xft xt
CONFIGURE_ARGS+= --libs="${LDFLAGS}"
CFLAGS+= `freetype-config --cflags`
LDFLAGS= `freetype-config --libs`
@@ -53,7 +53,7 @@ pre-everything::
@${ECHO_MSG} ""
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g ; \
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g ; \
s|-lipc|-lcurses|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|FT_FILE|ELVIS_FT_FILE|g' \
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index bf8d1df699e0..3e5913ed4052 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -37,9 +37,9 @@ USE_GMAKE= yes
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
.else
-USE_XLIB= yes
+USE_XORG= x11
.endif
-USE_XPM= yes
+USE_XORG= xpm xft
.endif
CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 08e923851581..fface6a84a41 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= 21.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -31,8 +31,7 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xpm
.endif
USE_AUTOTOOLS= autoconf:213
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index bf8d1df699e0..3e5913ed4052 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -37,9 +37,9 @@ USE_GMAKE= yes
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
.else
-USE_XLIB= yes
+USE_XORG= x11
.endif
-USE_XPM= yes
+USE_XORG= xpm xft
.endif
CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index bf8d1df699e0..3e5913ed4052 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -37,9 +37,9 @@ USE_GMAKE= yes
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk20
.else
-USE_XLIB= yes
+USE_XORG= x11
.endif
-USE_XPM= yes
+USE_XORG= xpm xft
.endif
CONFIGURE_TARGET= ${MACHINE_ARCH}-freebsd
diff --git a/editors/fte/files/patch-aa b/editors/fte/files/patch-aa
index 393b9544ff52..ba2ccd6b62aa 100644
--- a/editors/fte/files/patch-aa
+++ b/editors/fte/files/patch-aa
@@ -36,8 +36,8 @@
-XINCDIR = -I/usr/X11R6/include
-XLIBDIR = -L/usr/X11R6/lib -lstdc++
+UOS = -DFREEBSD
-+XINCDIR = -I$(X11BASE)/include
-+XLIBDIR = -L$(X11BASE)/lib
++XINCDIR = -I$(LOCALBASE)/include
++XLIBDIR = -L$(LOCALBASE)/lib
#######################################################################
# HP/UX
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index e9f4fe2d65d1..9c0572246313 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= gedit:${PORTSDIR}/editors/gedit \
USE_LDCONFIG= yes
USE_BZIP2= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 090cfa58be99..9f6bfa78ffa1 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gedit
PORTVERSION= 2.22.1
+PORTREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +23,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
USE_BZIP2= yes
USE_GETTEXT= yes
-USE_XLIB= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
USE_GMAKE= yes
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 1c1c1bda6590..7d008acfd744 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -7,10 +7,9 @@
PORTNAME= glimmer
PORTVERSION= 1.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors gnome python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gnome@FreeBSD.org
COMMENT= A full featured code editor for GNOME with many advanced features
@@ -20,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_X_PREFIX= yes
USE_PYTHON= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 8398f0d4a76a..97cba575ad69 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -7,10 +7,9 @@
PORTNAME= gnotepad+
PORTVERSION= 1.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors www gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnotepad
+MASTER_SITES= SF/gnotepad
.if !defined(NOPORTDOCS)
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}
@@ -22,8 +21,7 @@ COMMENT= Simple GTK-based text/HTML editor
DOCVERSION= 1.2.0
USE_GETTEXT= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
WANT_GNOME= yes
USE_GNOME= gnomeprefix gtk12
GNU_CONFIGURE= yes
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 3c028cc4c785..a73e16418e54 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -27,7 +27,6 @@ BROKEN= Configure fails without X support
# configure --program-suffix doesn't work somehow
MAKE_ARGS= binsuffix="${BINSUFFIX}"
-CONFIGURE_ARGS+= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
PORTDOCDIR= share/doc/gnuserv-${EMACS_PORT_NAME}
MAN1= gnuserv${BINSUFFIX}.1
diff --git a/editors/hte/Makefile b/editors/hte/Makefile
index 7c8b2a1814af..b83a58b0bc10 100644
--- a/editors/hte/Makefile
+++ b/editors/hte/Makefile
@@ -33,7 +33,7 @@ PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS=--disable-x11-textmode
.else
USE_XORG= x11
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
.endif
.if !defined(NOPORTDOCS)
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 3cdc153ea24b..87df857f32e5 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jed
PORTVERSION= 0.99.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v${PORTVERSION:R}/ \
ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v${PORTVERSION:R}/ \
@@ -52,7 +52,7 @@ LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
.if defined(WITHOUT_X11)
PLIST_SUB+= XJED="@comment "
.else
-USE_XLIB= yes
+USE_XORG= x11 ice xt
ALL_TARGET+= xjed
PLIST_SUB+= XJED=""
.endif
diff --git a/editors/jedit-devel/Makefile b/editors/jedit-devel/Makefile
index 0e4cca2946fc..1d3b99928ec5 100644
--- a/editors/jedit-devel/Makefile
+++ b/editors/jedit-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= jedit
DISTVERSION= 4.3.p13
+PORTREVISION= 1
CATEGORIES= editors java
MASTER_SITES= SF
DISTNAME= ${PORTNAME}${PORTVERSION:S/.p/pre/}install
@@ -24,7 +25,7 @@ JAVA_VERSION= 1.5+
CONFLICTS= jedit-4.2*
NO_LATEST_LINK= yes
-USE_XLIB= yes
+USE_XORG= x11
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 6565d41a1200..51bf9b35b49a 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -7,10 +7,9 @@
PORTNAME= jedit
PORTVERSION= 4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}install
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
@@ -25,7 +24,7 @@ CONFLICTS= jedit-4.3*
USE_JAVA= yes
JAVA_VERSION= 1.3+
-USE_XLIB= yes
+USE_XORG= x11
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index 15bbb7d3c81e..c8e4945b7b0b 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -7,10 +7,9 @@
PORTNAME= jext
PORTVERSION= 3.0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jext
+MASTER_SITES= SF
MAINTAINER= vd@FreeBSD.org
COMMENT= Powerful 100% pure Java text editor
@@ -18,7 +17,7 @@ COMMENT= Powerful 100% pure Java text editor
USE_JAVA= yes
JAVA_VERSION= 1.2+
NO_WRKSUBDIR= yes
-USE_XLIB= yes
+USE_XORG= x11
NO_BUILD= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index 67028eafe301..f6622ecf39d2 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -18,7 +18,7 @@ COMMENT= XML editor for KDE
USE_KDELIBS_VER=3
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index b61511e3155f..ae6687fe3f2a 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -25,7 +25,7 @@ USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= #
-MAKE_ENV= OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib -Fl${X11BASE}/lib" LCL_PLATFORM=${LCL_PLATFORM}
+MAKE_ENV= OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib" LCL_PLATFORM=${LCL_PLATFORM}
MAN1= lazbuild.1
PLIST= ${WRKDIR}/pkg-plist
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 4325a624db7b..e828ee1b5b52 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -23,8 +23,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
PTHREAD_LIB="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-chooser
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
diff --git a/editors/manedit/files/patch-Makefile.FreeBSD b/editors/manedit/files/patch-Makefile.FreeBSD
index 5312227bcb71..e4b3ce132ff1 100644
--- a/editors/manedit/files/patch-Makefile.FreeBSD
+++ b/editors/manedit/files/patch-Makefile.FreeBSD
@@ -7,7 +7,7 @@
-CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
+CFLAGS += -I. $(GTK_CFLAGS) \
-DPREFIX=\"$(PREFIX)\" \
- -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
+ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(LOCALBASE)\"
@@ -116,7 +116,7 @@
# Build Rules:
diff --git a/editors/manedit/files/patch-manedit.1 b/editors/manedit/files/patch-manedit.1
index 96769cf77123..294b94524560 100644
--- a/editors/manedit/files/patch-manedit.1
+++ b/editors/manedit/files/patch-manedit.1
@@ -12,5 +12,5 @@
-distributions).
+Global manual pages directory.
.TP
- %%X11BASE%%/man
+ %%LOCALBASE%%/man
Global X11 manual pages directory.
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index eee8e9f1549c..09f304ef48a5 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:261 libtool:15
USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= mlview.schemas
diff --git a/editors/nedit/files/patch-aa b/editors/nedit/files/patch-aa
index 8b0d0863d571..bd6e3db138ed 100644
--- a/editors/nedit/files/patch-aa
+++ b/editors/nedit/files/patch-aa
@@ -10,7 +10,7 @@
+ (cd source; make -f Makefile.freebsd install)
+ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 doc/nedit.man ${PREFIX}/man/man1/nedit.1
+ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 doc/nc.man ${PREFIX}/man/man1/nclient.1
-+ ${INSTALL} ${COPY} -m 644 NEdit.ad ${X11BASE}/lib/X11/app-defaults/NEdit.ad
++ ${INSTALL} ${COPY} -m 644 NEdit.ad ${LOCALBASE}/lib/X11/app-defaults/NEdit.ad
+
clean:
(cd util; $(MAKE) -f Makefile.common clean)
diff --git a/editors/nedit/files/patch-ac b/editors/nedit/files/patch-ac
index 4f4e0e0ce384..032e2a103580 100644
--- a/editors/nedit/files/patch-ac
+++ b/editors/nedit/files/patch-ac
@@ -15,8 +15,8 @@
#
-CFLAGS=-O -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
-LIBS= ${MOTIFLIB} -L${PREFIX}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
-+CFLAGS+=-O -I${X11BASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
-+LIBS+= ${MOTIFLIB} -L${X11BASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
++CFLAGS+=-O -I${LOCALBASE}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DUSE_XMIM
++LIBS+= ${MOTIFLIB} -L${LOCALBASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
include Makefile.common
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 96af254f541f..33878efef916 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 3.0.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -43,7 +44,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -125,7 +126,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT} \
+ imake:${PORTSDIR}/devel/imake \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice-3-devel/files/Makefile.localized b/editors/openoffice-3-devel/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice-3-devel/files/Makefile.localized
+++ b/editors/openoffice-3-devel/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 9966a8b02df0..e42e9fdf899a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -45,7 +45,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -124,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice-3/files/Makefile.localized
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 4f7fb50a5f87..a60432574279 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice.org
PORTVERSION= 1.0.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES+= editors java
MASTER_SITES+= http://openoffice.lunarshells.com/sources/:moz,ru,src,help \
ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:moz,ru,src,help \
@@ -33,7 +33,6 @@ MOZILLA_VERSION= 1.0
MOZILLA_SOURCE= mozilla-source-${MOZILLA_VERSION}.tar.gz
DISTFILES+= ${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
USE_GNOME= orbit
-USE_XLIB= yes
USE_PERL5= yes
USE_BISON= build
USE_GMAKE= yes
@@ -105,10 +104,10 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
- imake:${X_IMAKE_PORT} \
+ imake:${PORTSDIR}/devel/imake \
gcp:${PORTSDIR}/sysutils/coreutils \
Xvfb:${X_VFBSERVER_PORT} \
- ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT}
+ ${LOCALBASE}/lib/X11/fonts/misc/cursor.pcf.gz:${X_FONTS_MISC_PORT}
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf:261
WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src
@@ -192,7 +191,7 @@ do-build:
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.endif
- ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}'
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@@ -203,7 +202,7 @@ do-install:
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid
.endif
- @${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ @${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
@${SETENV} "LC_ALL=C" "LANG=C" DISPLAY="localhost:1001" ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}"
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
diff --git a/editors/openoffice.org-1.0/files/Makefile.localized b/editors/openoffice.org-1.0/files/Makefile.localized
index e33ab419ebc0..44ca594eaf8e 100644
--- a/editors/openoffice.org-1.0/files/Makefile.localized
+++ b/editors/openoffice.org-1.0/files/Makefile.localized
@@ -84,7 +84,7 @@ LANG_PKGNAME= ja
LANG_EXT= 81
LANG_CONFIGURE_ARG= JAPN
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
L10NHELP= helpcontent_${LANG_EXT}_unix.tgz
.endif
################################################################
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 059b5d1a5390..fc6784dcd5a8 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice.org
PORTVERSION= 1.1.5.${SNAPDATE}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= editors
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
http://openoffice.lunarshells.com/sources/1.1/ \
@@ -31,7 +31,6 @@ DISTFILES+= ${MOZILLA_PROJECT} ${MOZILLA_SOURCE}
USE_GNOME+= orbit
.endif
-USE_XLIB= yes
USE_PERL5= yes
USE_BISON= build
USE_GMAKE= yes
@@ -115,7 +114,7 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
gcp:${PORTSDIR}/sysutils/coreutils \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
#.if defined(WITHOUT_JAVA)
#LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
#.endif
diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.localized b/editors/openoffice.org-1.1-devel/files/Makefile.localized
index 6718908041a4..142de09a2e70 100644
--- a/editors/openoffice.org-1.1-devel/files/Makefile.localized
+++ b/editors/openoffice.org-1.1-devel/files/Makefile.localized
@@ -1,6 +1,6 @@
# localized makefile
# Whom: Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.localized,v 1.7 2005-09-02 00:22:14 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.localized,v 1.8 2008-04-19 17:48:18 miwi Exp $
################################################################
# consult config_office/set_soenv.in for available languages
@@ -145,7 +145,7 @@ LANG_PKGNAME= ja
LANG_EXT= 81
LANG_CONFIGURE_ARG= JAPN
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
L10NHELP= helpcontent_${LANG_EXT}_unix.tgz
.endif
################################################################
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 0d009fe68288..930622fc7f86 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openoffice.org
PORTVERSION= 1.1.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.1/ \
http://openoffice.lunarshells.com/sources/1.1/ \
@@ -29,7 +29,6 @@ DISTFILES+= ${MOZILLA_PROJECT} ${MOZILLA_SOURCE}
USE_GNOME+= orbit
.endif
-USE_XLIB= yes
USE_PERL5= yes
USE_BISON= build
USE_GMAKE= yes
@@ -110,7 +109,7 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
gcp:${PORTSDIR}/sysutils/coreutils \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
#.if defined(WITHOUT_JAVA)
#LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
#.endif
diff --git a/editors/openoffice.org-1.1/files/Makefile.localized b/editors/openoffice.org-1.1/files/Makefile.localized
index e03a9d2cf1c5..999a45f528e7 100644
--- a/editors/openoffice.org-1.1/files/Makefile.localized
+++ b/editors/openoffice.org-1.1/files/Makefile.localized
@@ -145,7 +145,7 @@ LANG_PKGNAME= ja
LANG_EXT= 81
LANG_CONFIGURE_ARG= JAPN
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf
L10NHELP= helpcontent_${LANG_EXT}_unix.tgz
.endif
################################################################
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 0954680d4937..20343eda7f1c 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -43,7 +44,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -123,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.localized
+++ b/editors/openoffice.org-2-RC/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index a7f6af36e732..aa8489ad0651 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
+PORTREVISION= 1
PORTEPOCH?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -45,7 +46,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -126,7 +127,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT} \
+ imake:${PORTSDIR}/devel/imake \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-2-devel/files/Makefile.localized b/editors/openoffice.org-2-devel/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.localized
+++ b/editors/openoffice.org-2-devel/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 9966a8b02df0..e42e9fdf899a 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -45,7 +45,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -124,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-2/files/Makefile.localized
+++ b/editors/openoffice.org-2/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 0954680d4937..20343eda7f1c 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -43,7 +44,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -123,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
diff --git a/editors/openoffice.org-3-RC/files/Makefile.localized b/editors/openoffice.org-3-RC/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.localized
+++ b/editors/openoffice.org-3-RC/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 96af254f541f..33878efef916 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 3.0.${SNAPDATE}
+PORTREVISION= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -43,7 +44,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -125,7 +126,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT} \
+ imake:${PORTSDIR}/devel/imake \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.localized
+++ b/editors/openoffice.org-3-devel/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 9966a8b02df0..e42e9fdf899a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= ${OOOVERSION}
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
http://openoffice.lunarshells.com/sources/ \
@@ -45,7 +45,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -124,7 +124,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT}
+ imake:${PORTSDIR}/devel/imake
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
.if !defined(WITH_GPC)
LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
diff --git a/editors/openoffice.org-3/files/Makefile.localized b/editors/openoffice.org-3/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-3/files/Makefile.localized
+++ b/editors/openoffice.org-3/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index a7f6af36e732..aa8489ad0651 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= openoffice.org
PORTVERSION?= 2.4.${SNAPDATE}
+PORTREVISION= 1
PORTEPOCH?= 1
CATEGORIES+= editors java
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -45,7 +46,7 @@ USE_GNOME+= libidl
.if defined(WITH_KDE)
USE_KDELIBS_VER= 3
.endif
-USE_XLIB= yes
+USE_XORG= x11 ice
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
@@ -126,7 +127,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
gpatch:${PORTSDIR}/devel/patch \
${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
bash:${PORTSDIR}/shells/bash \
- imake:${X_IMAKE_PORT} \
+ imake:${PORTSDIR}/devel/imake \
${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.localized b/editors/openoffice.org-vcltesttool/files/Makefile.localized
index a9a2c7ad694f..01bf95d9d315 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.localized
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.localized
@@ -162,7 +162,7 @@ LANG_PKGNAME= ${LOCALIZED_LANG}
.if ${LOCALIZED_LANG} == "ja"
CATEGORIES+= japanese
LANG_PKGNAME= ${LOCALIZED_LANG}
-RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
+RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/ipam.ttf:${PORTSDIR}/japanese/ipa-ttfonts
.endif
################################################################
.if ${LOCALIZED_LANG} == "ka"
diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile
index 9e2c7e87436e..9c160419ddcf 100644
--- a/editors/pdfedit/Makefile
+++ b/editors/pdfedit/Makefile
@@ -24,7 +24,7 @@ USE_QT_VER= 3
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"
-MAKE_ENV= ${CONFIGURE_ENV} QTDIR="${X11BASE}"
+MAKE_ENV= ${CONFIGURE_ENV} QTDIR="${LOCALBASE}"
CFLAGS+= -I${LOCALBASE}/include
MAN1= pdfedit.1
diff --git a/editors/qemacs/Makefile b/editors/qemacs/Makefile
index ce1687541f0f..c635b2d9ba01 100644
--- a/editors/qemacs/Makefile
+++ b/editors/qemacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qemacs
PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://fabrice.bellard.free.fr/qemacs/
@@ -46,9 +46,9 @@ LDFLAGS= `libpng-config --L_opts`
PKGNAMESUFFIX= -nox11
CONFIGURE_ARGS+= --disable-x11
.else
-USE_XLIB= yes
-CFLAGS+= -I${X11BASE}/include
-LDFLAGS+= -L${X11BASE}/lib
+USE_XORG= x11 xv xext
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
post-patch:
diff --git a/editors/richtext/files/patch-Imakefile b/editors/richtext/files/patch-Imakefile
index 458f195a8df2..9d071f1cd94f 100644
--- a/editors/richtext/files/patch-Imakefile
+++ b/editors/richtext/files/patch-Imakefile
@@ -5,7 +5,7 @@
#CC = objc -q -g
#MOTIFDIR=$(USRLIBDIR)
-MOTIFDIR=/usr/local/LessTif/Motif1.2
-+MOTIFDIR=${X11BASE}
++MOTIFDIR=${LOCALBASE}
.SUFFIXES : .m .lm
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 20fdd5e1c24e..4ade2a6e335e 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sam
PORTVERSION= 4.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors plan9
MASTER_SITES= ftp://ftp.cs.usyd.edu.au/matty/unicode/
DISTNAME= ${PORTNAME}
@@ -19,12 +19,12 @@ COMMENT= A unix version of Rob Pike's editor for plan9
DEPRECATED= distfile and homepage disappeared
EXPIRATION_DATE= 2007-01-04
+USE_XORG= x11 xt ice sm
EXTRACT_CMD= ${GZCAT}
EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= | ${SH}
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
MAN1= sam.1
MAN3= add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 \
diff --git a/editors/sam/files/patch-aa b/editors/sam/files/patch-aa
index 63af3ca481bd..c3c485a72e86 100644
--- a/editors/sam/files/patch-aa
+++ b/editors/sam/files/patch-aa
@@ -26,11 +26,11 @@
! OS=-DBSDi
# add -Iincludedir for any include directories that need to be searched
-! INCS=-I../include -I${X11BASE}/include
+! INCS=-I../include -I${LOCALBASE}/include
# set this if your X libraries are in different locations
# or if you need extra libraries to load with X11 applications
-! XLIBS=-lXt -lX11 -L${X11BASE}/lib
+! XLIBS=-lXt -lX11 -L${LOCALBASE}/lib
# add name of library orderer - use ":" if none
! RANLIB=ranlib
diff --git a/editors/sam/files/patch-ab b/editors/sam/files/patch-ab
index b17dc608431b..7bf0cb3a26e3 100644
--- a/editors/sam/files/patch-ab
+++ b/editors/sam/files/patch-ab
@@ -32,7 +32,7 @@
# add -Iincludedir for any include directories that need to be searched
# for posix header files (for UMIPS, add -I/usr/include/posix)
-! INCS=-I../include -I${X11BASE}/include
+! INCS=-I../include -I${LOCALBASE}/include
# add name of library orderer - use ":" if none exists
! RANLIB=ranlib
diff --git a/editors/sam/files/patch-ac b/editors/sam/files/patch-ac
index dca9bc5c5134..79495057a29d 100644
--- a/editors/sam/files/patch-ac
+++ b/editors/sam/files/patch-ac
@@ -35,7 +35,7 @@
# add -Iincludedir for any include directories that need to be searched
# for posix header files (for UMIPS, add -I/usr/include/posix)
-! INCS=-I../include -I${X11BASE}/include
+! INCS=-I../include -I${LOCALBASE}/include
# SAMTERM contains the name of the file containing the samterm
# executable. SAMTERMDIR is the directory where it is installed.
@@ -44,7 +44,7 @@
# set this if your X libraries are in different locations
# or if you need extra libraries to load with X11 applications
-! XLIBS=-lXt -lX11 -lSM -lICE -L${X11BASE}/lib
+! XLIBS=-lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
! CFLAGS+=$(OS) $(INCS) -D_LIBXG_EXTENSION
diff --git a/editors/setedit/Makefile b/editors/setedit/Makefile
index ea13388a238c..e4869593d680 100644
--- a/editors/setedit/Makefile
+++ b/editors/setedit/Makefile
@@ -8,8 +8,7 @@ PORTNAME= setedit
PORTVERSION= 0.5.4
PORTREVISION= 1
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= setedit
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= exile@chamber.ee
@@ -18,8 +17,7 @@ COMMENT= Programmer's editor with a nice Text User Interface (TUI)
LIB_DEPENDS= rhtv.2:${PORTSDIR}/devel/rhtvision
HAS_CONFIGURE= yes
-CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \
- X11BASE="${X11BASE}"
+CONFIGURE_ENV= LOCALBASE="${LOCALBASE}"
USE_PERL5_BUILD=yes
USE_GMAKE= yes
diff --git a/editors/setedit/files/patch-config.pl b/editors/setedit/files/patch-config.pl
index cd88b05bde79..cba2dbc20251 100644
--- a/editors/setedit/files/patch-config.pl
+++ b/editors/setedit/files/patch-config.pl
@@ -70,7 +70,7 @@
return 0;
}
';
-! $conf{'X11LibPath'}=$ENV{'X11BASE'} . '/lib' unless $conf{'X11LibPath'};
+! $conf{'X11LibPath'}=$ENV{'LOCALBASE'} . '/lib' unless $conf{'X11LibPath'};
$conf{'X11Lib'}='X11 Xmu' unless $conf{'X11Lib'};
$libs=$conf{'X11Lib'};
$libs=~s/(\S+)/-l$1/g;
@@ -87,7 +87,7 @@
{
if (!$conf{'X11IncludePath'})
{
-! $conf{'X11IncludePath'}=$ENV{'X11BASE'} . '/include';
+! $conf{'X11IncludePath'}=$ENV{'LOCALBASE'} . '/include';
$o.="-I$conf{'X11IncludePath'} -L$conf{'X11LibPath'} $libs";
if ($test=~/OK, (\d+)\.(\d+)/)
{
diff --git a/editors/softmaker-office/Makefile b/editors/softmaker-office/Makefile
index 2770aee3533e..b4db269fcd00 100644
--- a/editors/softmaker-office/Makefile
+++ b/editors/softmaker-office/Makefile
@@ -7,7 +7,7 @@
PORTNAME= SoftMaker-Office
PORTVERSION= 2006
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.softmaker.net/down/
DISTFILES= ofb06trial.tgz
@@ -15,9 +15,9 @@ DISTFILES= ofb06trial.tgz
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Microsoft Word/Excel OpenDocument and OpenOffice.org editor
-RUN_DEPENDS= ${X11BASE}/bin/xfs:${X_FONTSERVER_PORT}
+RUN_DEPENDS= ${LOCALBASE}/bin/xfs:${X_FONTSERVER_PORT}
-USE_XLIB= yes
+USE_XORG= x11
NO_BUILD= yes
diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile
index 0bb99d1b6813..c3fdd6b3a485 100644
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be downloaded direct from Sun via www interface'
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
IS_INTERACTIVE= yes
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_CMD= ${CAT}
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index f8bad036a43d..45430779fde6 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -41,7 +41,7 @@ CD_MOUNTPT= '/cdrom'
IS_INTERACTIVE= yes
NO_BUILD= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
DIST_SUBDIR= staroffice52
WRKSRC= ${WRKDIR}/office52
TMPDIR= ${WRKDIR}/tmp
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index dbb188f682be..b615d6a457a7 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -31,7 +31,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
IS_INTERACTIVE= yes
NO_BUILD= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index f01f3f46abbc..884a780761f4 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -34,7 +34,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
IS_INTERACTIVE= yes
NO_BUILD= yes
SOVERSION= ${PORTNAME}${PORTVERSION}
diff --git a/editors/the/Makefile b/editors/the/Makefile
index aacdf0b9a3c9..b2b0b50c22eb 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -8,8 +8,7 @@
PORTNAME= the
PORTVERSION= 3.2
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hessling-editor
+MASTER_SITES= SF/hessling-editor
DISTNAME= THE-${PORTVERSION}
PATCH_SITES= http://users.comlab.ox.ac.uk/ian.collier/distribution/
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index f6b6e44fc0ff..52c83a3e819b 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -10,7 +10,7 @@ PORTNAME?= vim
PATCHLEVEL= 282
PORTVERSION= 7.1.${PATCHLEVEL}
RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= editors
MASTER_SITES= ${MASTER_SITE_VIM}
DISTFILES= ${RELEASE}${EXTRACT_SUFX}
@@ -128,23 +128,26 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
.elif defined(WITH_GTK2)
USE_GNOME= gtk20
PKGNAMESUFFIX= -gtk2
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
.elif defined(WITH_GNOME)
.if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
${WITH_GNOME}=="1"
USE_GNOME= gnomelibs gnomeprefix
PKGNAMESUFFIX= -gnome
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
.else
USE_GNOME= gtk12
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
.endif
.elif defined(WITH_MOTIF)
USE_MOTIF= yes
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N}
.endif
.else # WITHOUT_X11
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N}
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index c9bd2c18208a..a095f0ba75e8 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -52,10 +52,10 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
USE_GNOME+= gtk12
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N}
.else
USE_MOTIF= yes
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N}
.endif
.else # WITHOUT_X11
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 57eb2da08cf2..43484c3ac39c 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -9,7 +9,7 @@
PORTNAME?= vim6
PATCHLEVEL= 9
PORTVERSION= 6.4.${PATCHLEVEL}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= editors
MASTER_SITES= ${MASTER_SITE_VIM}
DISTNAME= vim-${PORTVERSION:C/\.[0-9a-z]*$//}
@@ -104,23 +104,26 @@ MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
.elif defined(WITH_GTK2)
USE_GNOME= gtk20
PKGNAMESUFFIX= -gtk2
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
.elif defined(WITH_GNOME)
.if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
${WITH_GNOME}=="1"
USE_GNOME= gnomelibs gnomeprefix
PKGNAMESUFFIX= -gnome
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
.else
USE_GNOME= gtk12
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
.endif
.elif defined(WITH_MOTIF)
USE_MOTIF= yes
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N}
.endif
.else # WITHOUT_X11
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N}
@@ -141,7 +144,7 @@ pre-configure:
@${REINPLACE_CMD} -e ' \
s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
- s|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${X11BASE}|g '\
+ s|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g '\
${WRKSRC}/auto/configure
# Clean up junk files to keep them from being installed.
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index ffa1eed119cd..2131dd173d0c 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -9,14 +9,13 @@ PORTNAME= wily
PORTVERSION= 0.13.42
PORTREVISION= 2
CATEGORIES= editors plan9
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= serge.gagnon.1@ulaval.ca
COMMENT= A clone of the Plan9 editor `acme'
RUN_DEPENDS= ${LOCALBASE}/bin/rc:${PORTSDIR}/shells/rc \
- ${X11BASE}/lib/X11/fonts/Xg/unicode.9.font:${PORTSDIR}/x11-fonts/Xg
+ ${LOCALBASE}/lib/X11/fonts/Xg/unicode.9.font:${PORTSDIR}/x11-fonts/Xg
USE_XORG= x11 ice xt
GNU_CONFIGURE= YES
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index a696c1f8e5af..abe310607377 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -7,15 +7,15 @@
PORTNAME= xcoral
PORTVERSION= 3.46
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://xcoral.free.fr/
MAINTAINER= ports@FreeBSD.org
COMMENT= A multiwindow mouse-based text editor for X
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
+USE_XORG= x11
CONFIGURE_ARGS= --libdir=${PREFIX}/share
CONFIGURE_ENV= LIBS="-lgnuregex"
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/editors/xed/Makefile b/editors/xed/Makefile
index fdb9a82641fc..776477104b30 100644
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A text editor for X
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= xed.1
pre-build:
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 15c90685f1b5..fb7df634fa0c 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER:S/-/./}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -43,7 +43,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces
-USE_XORG= x11 xpm
+USE_XORG+= x11 xpm
CONFIGURE_ARGS= --with-xpm
.endif
@@ -57,14 +57,12 @@ USE_AUTOTOOLS= autoconf:261
CONFIGURE_TARGET=--build=${XEMACS_ARCH}
CONFIGURE_ARGS+= --enable-mule \
- --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib \
--with-site-libraries='${SITE_LIBRARIES}' \
--with-site-includes='${SITE_INCLUDES}' \
--enable-sound=native \
--with-site-lisp \
--with-pop \
- --with-infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
+ --with-infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
--enable-clash-detection \
--enable-database=berkdb \
${WITH_XIM} \
@@ -110,7 +108,7 @@ CONFIGURE_ARGS+=--disable-kkcc --disable-mc-alloc --disable-newgc
.if defined(WITH_XFT)
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_XORG= x11 xft xpm
+USE_XORG+= x11 xft xpm
CONFIGURE_ARGS+=--with-xft=all
.elif defined(WITH_GTK)
CONFIGURE_ARGS+=--with-gtk
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index d2d4f04ad9c1..31c8d1b76dc8 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs-devel
PORTVERSION= ${XEMACS_VER:S/-/./}
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
@@ -29,9 +29,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
compface.1:${PORTSDIR}/mail/faces
-USE_XLIB= yes
-USE_XORG= xbitmaps
-USE_XPM= yes
+USE_XORG+= xbitmaps x11 ice xext xaw xt xmu
.endif
XEMACS_MAJOR_VER?= 21
@@ -82,7 +80,7 @@ PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
.include <bsd.port.pre.mk>
-.if exists(${X11BASE}/lib/libXm.so)
+.if exists(${LOCALBASE}/lib/libXm.so)
USE_MOTIF= yes
HAVE_MOTIF= yes
.endif
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 929b28d15037..ec9ee8ea06e9 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xemacs
PORTVERSION= ${XEMACS_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -94,8 +94,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xpm x11
.if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
USE_MOTIF= yes
WITH_SCROLLBARS= --with-scrollbars=motif
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index f6bb1bd8c554..cf4c35afd921 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -55,8 +55,6 @@ CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS= --with-x11 \
--with-mule \
- --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib \
--with-site-lisp \
--site-libraries='${SITE_LIBRARIES}' \
--site-includes='${SITE_INCLUDES}' \
@@ -68,7 +66,7 @@ CONFIGURE_ARGS= --with-x11 \
--with-png \
--with-tiff \
--with-xpm \
- --infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:${X11BASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
+ --infopath=${LOCALBASE}/lib/xemacs/info:${LOCALBASE}/info:/usr/info:${LOCALBASE}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \
--with-clash-detection \
--with-database=berkdb \
${WITH_XIM} \
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index 423ae681fc01..1baf6ab2ee2c 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple X-based text editor
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAKEFILE= ${WRKSRC}/makefiles/Makefile.Linux
NOPRECIOUSSOFTMAKEVARS= yes
EXAMPLESDIR= ${PREFIX}/share/examples/ex
diff --git a/editors/xenon/files/patch-ab b/editors/xenon/files/patch-ab
index 53d82910eefb..24cb26019b8e 100644
--- a/editors/xenon/files/patch-ab
+++ b/editors/xenon/files/patch-ab
@@ -20,8 +20,8 @@
-INCLUDES = -I$(XEINC)
-LIBS = -L/usr/X11R6/lib -lXpm -lX11
-+INCLUDES = -I$(XEINC) -I$(X11BASE)/include
-+LIBS = -L$(X11BASE)/lib -lXpm -lX11
++INCLUDES = -I$(XEINC) -I$(LOCALBASE)/include
++LIBS = -L$(LOCALBASE)/lib -lXpm -lX11
backup:
cd ..;tar -cvzf xenon.tar.gz $(BACKUP)
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 057f6915d2fc..9a9ea2fe6242 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -32,9 +32,7 @@ USE_PERL5= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-libdir-path=${PREFIX}/lib/xvile \
- --datadir=${PREFIX}/share/xvile \
- --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
+ --datadir=${PREFIX}/share/xvile
MAN1= xvile.1
OPTIONS= FILTERS "Add support for loadable filters" OFF
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 0522592a8aa6..2dea73a5877e 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -19,8 +19,8 @@ COMMENT= Multi-lingual unicode text editor with TTF support
USE_GETTEXT= yes
USE_XORG= x11
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LDFLAGS="-L${X11BASE}/lib" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
LC_ALL=
GNU_CONFIGURE= YES
MAKE_ENV= LC_ALL=