diff options
Diffstat (limited to 'editors')
33 files changed, 50 insertions, 65 deletions
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile index faa8869af90..89ff79f3913 100644 --- a/editors/TeXmacs/Makefile +++ b/editors/TeXmacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/05/31 16:37:09 drochner Exp $ +# $NetBSD: Makefile,v 1.44 2005/06/01 18:02:45 jlam Exp $ DISTNAME= TeXmacs-1.0.5.2-src PKGNAME= ${DISTNAME:S/-src//} @@ -15,7 +15,6 @@ BUILD_TARGET= TEXMACS USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python @@ -28,6 +27,7 @@ SUBST_SED.init= -e 's,@PYTHONBIN@,${PYTHONBIN},g' .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 4f3e984f7dd..25c539c8aea 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:07:55 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/06/01 18:02:45 jlam Exp $ # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating ABIWORD_VERSION= 2.2.7 @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png} diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile index 0cab4a5537c..9c4e668a81c 100644 --- a/editors/beaver/Makefile +++ b/editors/beaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:40 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= beaver-0.2.6 @@ -12,8 +12,6 @@ COMMENT= Lightweight GTK+ text editor with syntax highlighting WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_DIRS+= xdg-1.1 -USE_X11= YES .include "../../x11/gtk/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile index 80ec3cf705d..5c88a9d389b 100644 --- a/editors/ce-x11/Makefile +++ b/editors/ce-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:40 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:45 jlam Exp $ # .include "../ce/Makefile.common" @@ -8,7 +8,6 @@ COMMENT+= , X11 version PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_X11= # defined BUILD_TARGET= xce INSTALL_TARGET= install-x11 man-install-x11 @@ -16,4 +15,5 @@ INSTALL_TARGET= install-x11 man-install-x11 INSTALLATION_DIRS= bin man/man1 .include "../../mk/curses.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 747bdafba65..3a7ae69ceb6 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:55 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:45 jlam Exp $ DISTNAME= cooledit-3.17.14 CATEGORIES= editors @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_TOOLS+= gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index 59416891235..e0cb64c64e7 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:55 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= dasher-3.2.15 @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes .include "../../audio/gnome-speech/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index 7c76c72ddea..e59015cd789 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/10/03 00:14:38 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $ # .include "../elvis/Makefile.common" @@ -9,7 +9,6 @@ COMMENT= GUI for elvis, includes console elvis CONFLICTS+= elvis-[0-9]* -USE_X11= YES CONFIGURE_ARGS+= --with-x=yes CONFIGURE_ARGS+= --with-xft diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 2a7c6155360..6f714fef719 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.85 2005/06/01 18:02:45 jlam Exp $ DISTNAME= emacs-21.4a PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= GNU editing macros (editor) CONFLICTS= mule-[0-9]* -USE_X11= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 2fe57db903b..01e0ab96d82 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:45 jlam Exp $ DISTNAME= emacs-20.7 PKGREVISION= 5 @@ -52,8 +52,8 @@ CONFIGURE_ARGS+=--with-pop .endif .if defined(EMACS_USE_X) +.include "../../mk/x11.buildlink3.mk" BUILD_DEFS+= EMACS_USE_X EMACS_USE_X_TOOLKIT -USE_X11= yes CONFIGURE_ARGS+= --with-x=yes .if defined(EMACS_USE_X_TOOLKIT) CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT} diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index 5557887842b..315ae6a2166 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= gconf-editor-2.10.0 @@ -17,7 +17,6 @@ USE_DIRS+= xdg-1.1 gnome2-1.5 USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE} CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g} diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index f94a7cfaaa4..8329f22ff6d 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= gedit-2.10.2 @@ -16,7 +16,6 @@ USE_PERL5= build USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake -USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/editors/gice/Makefile b/editors/gice/Makefile index 127da75128e..da1aaf38592 100644 --- a/editors/gice/Makefile +++ b/editors/gice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= gice-0.6.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://gice.sourceforge.net/ COMMENT= Powerful C text editor with advanced features WRKSRC= ${WRKDIR}/gice -USE_X11= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index 56718e95be4..58b417a2b9e 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/01/31 00:10:12 minskim Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $ DISTNAME= gnuserv-3.12.7 PKGREVISION= 1 @@ -12,7 +12,8 @@ COMMENT= Improved version of emacsserver for GNU Emacs CONFLICTS+= xemacs-[0-9]* GNU_CONFIGURE= YES -USE_X11= YES + +.include "../../mk/x11.buildlink3.mk" EL_FILES= devices.el gnuserv.el gnuserv-compat.el post-install: diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile index a9748a464fa..b195fa75df0 100644 --- a/editors/gtranslator/Makefile +++ b/editors/gtranslator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:45 jlam Exp $ DISTNAME= gtranslator-1.0.2 CATEGORIES= editors @@ -13,7 +13,6 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -USE_X11= yes GNU_CONFIGURE= yes MANCOMPRESSED= yes diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 6cc924dd8ca..560332a5ddd 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= lyx-1.3.5 @@ -29,7 +29,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PERL5= YES USE_PKGLOCALEDIR= YES -USE_X11= YES GCC_REQD+= 2.95 CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \ @@ -84,3 +83,4 @@ PYTHON_PATCH_SCRIPTS= lib/lyx2lyx/lyx2lyx \ .include "../../textproc/aiksaurus/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 6134eebe836..f92faf43e58 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:56 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:45 jlam Exp $ DISTNAME= mule-2.3 PKGREVISION= 2 @@ -23,7 +23,6 @@ CONFLICTS= emacs-[0-9]* WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes USE_TOOLS+= gmake -USE_X11= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid CONFIGURE_ARGS+= --terminal-face --mcpath @@ -47,6 +46,8 @@ INFO_FILES+= mule-jp quail sc terminology vip MAN1= coco.1 ctags.1 etags.1 m2ps.1 mule.1 +.include "../../mk/x11.buildlink3.mk" + post-patch: @${ECHO_MSG} "===> Applying jumbo patches in info directory" @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/info.patch diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 9976ca05f00..b961ab10e20 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:41 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:45 jlam Exp $ DISTNAME= nedit-${VERS}-src PKGNAME= nedit-${VERS} @@ -16,7 +16,6 @@ COMMENT= Motif based standard GUI style text editor VERS= 5.5 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_X11= YES BUILD_TARGET= netbsd do-install: diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 67521e08b27..3b38387af2f 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:45 jlam Exp $ # DISTNAME= poedit-1.2.5 @@ -15,7 +15,6 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake -USE_X11= yes .include "../../databases/db4/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 21b1bbab305..b5c3372ee0f 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:41 tv Exp $ +# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:46 jlam Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -27,6 +27,8 @@ MAKE_ENV+= X11PREFIX=${X11PREFIX} OTHER_X_LIBS= -lSM -lICE .endif +.include "../../mk/x11.buildlink3.mk" + do-build: for d in libXg libframe sam samterm; do \ (cd ${WRKSRC}/$$d; ${MAKE_PROGRAM} -f Make.solaris \ diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile index 3ab5f6c0aa0..069e9712c71 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:42 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= vigor-0.016 @@ -13,7 +13,6 @@ COMMENT= nvi with excessive online "help" CONFLICTS+= nvi-[0-9]* WRKSRC= ${WRKDIR}/${DISTNAME}/build -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-x diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 4cf539a588e..ecb2bd95093 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=gtk CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile index 4b33878010c..686faa9fb53 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=gtk2 CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 090d35a4244..c6864ba8556 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=motif CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index bbed1f1ad94..3f0dac1d781 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/05/30 14:18:14 martti Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:46 jlam Exp $ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} #PKGREVISION= 1 @@ -11,7 +11,6 @@ DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --enable-gui=athena CONFIGURE_ARGS+= --with-tlib=ncurses diff --git a/editors/wily/Makefile b/editors/wily/Makefile index 63a958e63b3..25d50203b53 100644 --- a/editors/wily/Makefile +++ b/editors/wily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:35:10 grant Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= wily-0.13.41 @@ -11,8 +11,8 @@ HOMEPAGE= http://www.cs.yorku.ca/~oz/wily/ COMMENT= Unix/X11 clone of the Plan9 acme editor/environment GNU_CONFIGURE= yes -USE_X11= yes DEPENDS+= libXgFonts-1.0:../../fonts/Xg +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index ff71c6e8732..a7b6e4b5f80 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $ DISTNAME= xcoral-3.2 CATEGORIES= editors @@ -18,6 +18,8 @@ LIBFILES= DEPEND README cmd.sc color.sc comments.sc compare-win.sc \ rcs.sc save.sc sun-keydef.sc title.sc top-ten.sc \ utilities.sc version.sc window-utilities.sc xcoralrc.lf +.include "../../mk/x11.buildlink3.mk" + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/xcoral ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcoral/HTML/icons diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index cc875d2bc55..a51fae9576f 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/04/11 21:45:42 tv Exp $ +# $NetBSD: Makefile,v 1.48 2005/06/01 18:02:46 jlam Exp $ DISTNAME= xemacs-21.5.19 @@ -11,7 +11,6 @@ COMMENT= *BETA* XEmacs text editor version 21.5.19 CONFLICTS+= gnuclient-[0-9]* -USE_X11= YES BUILD_DEFS+= XEMACS_WIDGETS PLIST_SUBST+= EMACSVER=xemacs-21.5-b19 diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 037724625b9..b9b66b208a1 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.77 2005/04/25 17:23:50 magick Exp $ +# $NetBSD: Makefile,v 1.78 2005/06/01 18:02:46 jlam Exp $ .include "../../editors/xemacs/Makefile.common" MAINTAINER= uebayasi@NetBSD.org -USE_X11= YES CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR} diff --git a/editors/xemacs/Makefile.pkg b/editors/xemacs/Makefile.pkg index 44fbca5e5c8..606be3e3210 100644 --- a/editors/xemacs/Makefile.pkg +++ b/editors/xemacs/Makefile.pkg @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.pkg,v 1.1 2002/04/26 09:35:06 tron Exp $ +# $NetBSD: Makefile.pkg,v 1.2 2005/06/01 18:02:46 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -9,5 +9,5 @@ MAKEFLAGS+= XEMACS_PREFIX=${XEMACS_PREFIX} .endif .if (${XEMACS_PREFIX} == ${X11BASE}) -USE_X11BASE= YES +.include "../../mk/x11.buildlink3.mk" .endif diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile index b03a7eb1122..bed76696aac 100644 --- a/editors/xjed/Makefile +++ b/editors/xjed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/12/03 15:14:56 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:46 jlam Exp $ # PKGNAME= xjed-0.99.16 .include "../jed/Makefile.common" @@ -6,7 +6,6 @@ COMMENT= Extensible folding editor with Emacs/WordStar/EDT emulations, X11 vers CONFLICTS= jed-[0-9]* -USE_X11= yes CONFIGURE_ARGS+= --with-x BUILD_TARGET= xjed @@ -22,4 +21,5 @@ PLIST_SRC+= ${.CURDIR}/PLIST.xjed CONFIGURE_ENV+= ac_cv_func_grantpt=no .endif +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index f34fd3b3722..cf4f65eafc1 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/04/11 21:45:42 tv Exp $ +# $NetBSD: Makefile,v 1.44 2005/06/01 18:02:46 jlam Exp $ DISTNAME= vile-9.4 PKGNAME= xvile-9.4 @@ -12,7 +12,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://dickey.his.com/vile/vile.html COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike -USE_X11= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-perl diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile index 28c0fa91a5a..0913be44653 100644 --- a/editors/xwpe/Makefile +++ b/editors/xwpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= xwpe-1.5.29a @@ -13,9 +13,9 @@ COMMENT= Programming environment for UNIX systems GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_NCURSES= # tigetstr() -USE_X11= yes BUILD_TARGET= # defined .include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 31ba2bd9be3..ff275505516 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:57 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:46 jlam Exp $ # DISTNAME= yudit-2.7.6 @@ -12,10 +12,10 @@ COMMENT= Unicode Text Editor USE_TOOLS+= gmake USE_LANGUAGES= c c++ -USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-x .include "../../graphics/freetype-lib/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |