pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors Restructure the following packages:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/948de4d77af4
branches:  trunk
changeset: 541683:948de4d77af4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 24 15:32:15 2008 +0000

description:
Restructure the following packages:

        editors/xemacs
        editors/xemacs-nox11

The latter is now just editors/xemacs built with a specific set of
options.  Changes include:

+ Add support for the following new options in options.mk:

        x11             Support X11 displays
        lucid           Use Lucid widget set

  Also add commented out support for the following options for
  alternative widget sets:

        gtk             GTK widgets
        motif           Motif widgets
        xaw             Athena widgets

  Note that USE_ATHENA, USE_GTK, and USE_MOTIF are legacy variables for
  the corresponding options.

+ Remove Makefile.common and move all logic into xemacs/Makefile and
  xemacs/options.mk.

+ Rename the "mule" PLIST variable to "canna", which more accurately
  reflects what is conditionally installed.

+ Include termcap.buildlink3.mk to properly deal with termcap/curses
  issues (xemacs needs termcap).  Drop the --with-ncurses=no setting
  as the issue is handled by termcap.buildlink3.mk.

+ In xemacs/Makefile, we don't need separate EXTRACT_ONLY and EXTRA_FILES
  if we're actually going to extract all of those files all of the time.
  Just list them all in DISTFILES.

+ Be slightly more aware of ${X11_TYPE} == "modular" by not referring to
  ${X11BASE} in that case.

+ In patch-ak, directly substitute the local value of etcdir (``../etc/'')
  into src/Makefile.in.in.  This allows for overriding etcdir via
  INSTALL_MAKE_FLAGS at install-time so that destdir-style installation
  will work.

+ Support DESTDIR installation by adding INSTALL_MAKE_FLAGS to override
  where files are installed during the install phase.

+ Honor PKGMANDIR.

+ Bump the PKGREVISION for xemacs and xemacs-nox11 to 4.  Both packages
  now track and use the same PKGREVISION number.

diffstat:

 editors/xemacs-nox11/DESCR      |   21 ------
 editors/xemacs-nox11/Makefile   |   33 +++------
 editors/xemacs/Makefile         |  110 +++++++++++++++++++++++++++++---
 editors/xemacs/Makefile.common  |  122 ------------------------------------
 editors/xemacs/PLIST            |    4 +-
 editors/xemacs/distinfo         |    4 +-
 editors/xemacs/options.mk       |  133 ++++++++++++++++++++++++++++++++++++++-
 editors/xemacs/patches/patch-ak |   26 ++++++-
 8 files changed, 264 insertions(+), 189 deletions(-)

diffs (truncated from 549 to 300 lines):

diff -r 22cde3685f2a -r 948de4d77af4 editors/xemacs-nox11/DESCR
--- a/editors/xemacs-nox11/DESCR        Thu Apr 24 15:20:06 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-XEmacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to XEmacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-XEmacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-XEmacs's many special packages handle mail reading (RMail) and sending
-(Mail), outline editing (Outline), compiling (Compile), running
-subshells within Emacs windows (Shell), running a Lisp read-eval-print
-loop (Lisp-Interaction-Mode), automated psychotherapy (Doctor :-) and
-many more. There is a WWW browsing mode written fully in elisp
-that looks and behaves much like the netscape WWW browser.
-
-XEmacs has similar functionality to GNU Emacs. It uses a different
-display model, including support for Motif menu and scroll bars and the
-ability to run as a widget inside other applications. Many people say
-it looks nicer than GNU Emacs.
-
-Web site: http://www.xemacs.org
diff -r 22cde3685f2a -r 948de4d77af4 editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Thu Apr 24 15:20:06 2008 +0000
+++ b/editors/xemacs-nox11/Makefile     Thu Apr 24 15:32:15 2008 +0000
@@ -1,26 +1,17 @@
-# $NetBSD: Makefile,v 1.19 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/24 15:32:16 jlam Exp $
 
-.include "../../editors/xemacs/Makefile.common"
+PKGNAME=       ${DISTNAME:S/-/-nox11-/}
 
-PKGNAME=       ${DISTNAME:S/xemacs/xemacs-nox11/}
-PKGREVISION=   2
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-
-CONFLICTS=     xemacs-[0-9]*
+FILESDIR=      ${.CURDIR}/../../editors/xemacs/files
+PATCHDIR=      ${.CURDIR}/../../editors/xemacs/patches
+PKGDIR=                ${.CURDIR}/../../editors/xemacs
 
-PLIST_SRC=     ${.CURDIR}/../xemacs/PLIST
-DISTINFO_FILE= ${.CURDIR}/../xemacs/distinfo
-FILESDIR=      ${.CURDIR}/../xemacs/files
-PATCHDIR=      ${.CURDIR}/../xemacs/patches
+# Mirror PKG_DESTDIR_SUPPORT setting from xemacs/Makefile.
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+.include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=       --without-x11   # XXX -nox
-CONFIGURE_ARGS+=       --without-jpeg  # XXX -nox
-CONFIGURE_ARGS+=       --without-png   # XXX -nox
-CONFIGURE_ARGS+=       --without-tiff  # XXX -nox
-CONFIGURE_ARGS+=       --without-xpm   # XXX -nox
-CONFIGURE_ARGS+=       --site-includes=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib
-CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib
+PKG_OPTIONS.xemacs+=   -x11 -lucid
+#PKG_OPTIONS.xemacs+=  -gtk -motif -xaw
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../editors/xemacs/Makefile"
diff -r 22cde3685f2a -r 948de4d77af4 editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Thu Apr 24 15:20:06 2008 +0000
+++ b/editors/xemacs/Makefile   Thu Apr 24 15:32:15 2008 +0000
@@ -1,19 +1,105 @@
-# $NetBSD: Makefile,v 1.84 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2008/04/24 15:32:15 jlam Exp $
+
+PKGNAME?=      ${DISTNAME}
+COMMENT?=      XEmacs text editor version 21
 
-.include "../../editors/xemacs/Makefile.common"
+DISTNAME=      xemacs-21.4.17
+PKGREVISION=   4
+CATEGORIES=    editors
+MASTER_SITES=  ${MASTER_SITE_XEMACS:=xemacs-21.4/}
+DISTFILES=     ${DISTNAME}.tar.gz ${DISTNAME}-elc.tar.gz \
+               ${DISTNAME}-info.tar.gz
 
 MAINTAINER=    uebayasi%NetBSD.org@localhost
-PKGREVISION=   3
+HOMEPAGE=      http://www.xemacs.org/
+
+CONFLICTS+=    gnuserv-[0-9]*
+CONFLICTS+=    xemacs-[0-9]*
+CONFLICTS+=    xemacs-nox11-[0-9]*
+
+NOT_FOR_PLATFORM=      *-*-mips*       # fails purespace dumping
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+HAS_CONFIGURE=         yes
+
+DIST_SUBDIR=           xemacs
+PLIST_SUBST+=          DISTNAME=${DISTNAME:Q}
+FILES_SUBST+=          DISTNAME=${DISTNAME:Q}
+MESSAGE_SUBST+=                DISTNAME=${DISTNAME:Q}
+INFO_FILES=            # PLIST
+
+.include "options.mk"
 
-CONFIGURE_ARGS+=       --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
-CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
-CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib
+CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=       --mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
+CONFIGURE_ARGS+=       --with-clash-detection
+CONFIGURE_ARGS+=       --with-mule=yes
+CONFIGURE_ARGS+=       --with-msw=no
+CFLAGS+=               -Dunix
+
+.if ${X11_TYPE} != "modular"
+INFOPATH=              ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+.else
+INFOPATH=              ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+.endif
+CONFIGURE_ARGS+=       --infopath=${INFOPATH:Q}
+
+.if ${OPSYS} == "SunOS"
+.  if !exists(/usr/demo/SOUND/libaudio.a) && \
+      !exists(/usr/demo/SOUND/lib/libaudio.a)
+CONFIGURE_ARGS+=       --with_sound=none
+.  endif
+.endif
+
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtbegin.o)
+CPPFLAGS+=             -DDFLY_PRE_17_CRT
+.endif
 
-PLIST.x11=     yes
+CHECK_WRKREF_SKIP=     bin/xemacs*
+REPLACE_SH=            etc/check_cygwin_setup.sh
+
+LIBDIR=                        ${PREFIX}/lib/${DISTNAME}
+ARCHLIBDIR=            ${LIBDIR}/${MACHINE_GNU_PLATFORM}
 
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xbitmaps/buildlink3.mk"
+# This list overrides variables used in the source Makefiles at install
+# time to allow for ${DESTDIR}-style installation.  This variables list
+# is pulled from the ``mkdir'' target of Makefile.in.in.
+#
+INSTALL_MAKE_FLAGS+=   archlibdir=${DESTDIR}${ARCHLIBDIR}
+INSTALL_MAKE_FLAGS+=   bindir=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+=   datadir=${DESTDIR}${PREFIX}/lib
+INSTALL_MAKE_FLAGS+=   docdir=${DESTDIR}${ARCHLIBDIR}
+INSTALL_MAKE_FLAGS+=   etcdir=${DESTDIR}${LIBDIR}/etc
+INSTALL_MAKE_FLAGS+=   exec_prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   infodir=${DESTDIR}${LIBDIR}/info
+INSTALL_MAKE_FLAGS+=   libdir=${DESTDIR}/lib
+INSTALL_MAKE_FLAGS+=   lispdir=${DESTDIR}${LIBDIR}/lisp
+INSTALL_MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=   moduledir=${DESTDIR}${ARCHLIBDIR}/modules
+INSTALL_MAKE_FLAGS+=   pkgdir=${DESTDIR}${LIBDIR}/lisp
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp
+INSTALL_MAKE_FLAGS+=   sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
+
+post-extract:
+       cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
+
+pre-build:
+       rm -f ${WRKSRC}/etc/ctags.1.orig
+
+.if defined(MANZ)
+PLIST_SUBST+=          ELSUFX='.gz'
+.else
+PLIST_SUBST+=          ELSUFX=''
+
+post-install:
+       find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
+.endif
+
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff -r 22cde3685f2a -r 948de4d77af4 editors/xemacs/Makefile.common
--- a/editors/xemacs/Makefile.common    Thu Apr 24 15:20:06 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-# $NetBSD: Makefile.common,v 1.20 2008/04/12 22:43:00 jlam Exp $
-
-DISTNAME=      xemacs-21.4.17
-CATEGORIES=    editors
-MASTER_SITES=  ${MASTER_SITE_XEMACS:=xemacs-21.4/}
-DISTFILES=     ${EXTRACT_ONLY} ${EXTRA_FILES}
-
-HOMEPAGE=      http://www.xemacs.org/
-COMMENT=       XEmacs text editor version 21
-
-CONFLICTS+=    gnuserv-[0-9]*
-
-NOT_FOR_PLATFORM=      *-*-mips*       # fails purespace dumping
-
-USE_TOOLS+=    gtar
-
-DIST_SUBDIR=   xemacs
-EXTRA_FILES=   ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz
-EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
-PLIST_VARS+=   x11
-PLIST_SUBST+=  DISTNAME=${DISTNAME:Q}
-FILES_SUBST+=  DISTNAME=${DISTNAME:Q}
-MESSAGE_SUBST+=        DISTNAME="${DISTNAME}"
-INFO_FILES=    # PLIST
-
-.include "options.mk"
-
-# XXX GUI configuration is a mess...
-#
-#.if defined(USE_ATHENA)
-#WITH_DIALOGS= \
-#              --with-menubars=athena \
-#              --with-scrollbars=athena \
-#              --with-dialogs=athena \
-#              --with-widgets=athena \
-#              --with-athena=xaw \
-#              --with-xim=xlib
-#.include "../../mk/xaw.buildlink3.mk"
-#.elif defined(USE_MOTIF)
-#WITH_DIALOGS= \
-#              --with-menubars=motif \
-#              --with-scrollbars=motif \
-#              --with-dialogs=motif \
-#              --with-widgets=motif \
-#              --with-xim=motif
-#.include "../../mk/motif.buildlink3.mk"
-#.elif defined(USE_GTK)
-#WITH_DIALOGS= \
-#              --with-gtk \
-#              --with-menubars=yes \
-#              --with-scrollbars=yes \
-#              --with-dialogs=yes \
-#              --with-widgets=yes \
-#              --with-xim=yes
-#.include "../../x11/gtk/buildlink3.mk"
-#.else
-# XXX Default is "lucid".  Due to the output of `configure --help', Lucid
-#     widgets wrap Athena, so xaw.buildlink3.mk.
-WITH_DIALOGS= \
-               --with-toolbars=yes \
-               --with-menubars=lucid \
-               --with-scrollbars=lucid \
-               --with-dialogs=lucid \
-               --with-widgets=lucid \
-               --with-athena=xaw \
-               --with-xim=xlib
-.include "../../mk/xaw.buildlink3.mk"
-#.endif
-
-.if ${OPSYS} == "SunOS"
-.  if !exists(/usr/demo/SOUND/libaudio.a) && !exists(/usr/demo/SOUND/lib/libaudio.a)
-CONFIGURE_ARGS+=       --with_sound=none
-.  endif
-.endif
-
-.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o)
-CPPFLAGS+=     -DDFLY_PRE_17_CRT
-.endif
-
-.if defined(MANZ)
-PLIST_SUBST+=  ELSUFX='.gz'
-.else
-PLIST_SUBST+=  ELSUFX=''
-.endif
-
-.include "../../databases/gdbm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
-INFOPATH=      ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
-
-HAS_CONFIGURE=         YES
-CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=       --with-clash-detection
-CONFIGURE_ARGS+=       --with-mule=yes
-.if ${OPSYS} != "Linux"
-CONFIGURE_ARGS+=       --with-ncurses=no
-.endif
-CONFIGURE_ARGS+=       --with-msw=no
-CONFIGURE_ARGS+=       ${WITH_DIALOGS}
-CONFIGURE_ARGS+=       --infopath=${INFOPATH:Q}
-
-CFLAGS+=               -Dunix
-
-CHECK_WRKREF_SKIP=     bin/xemacs*
-
-post-extract:
-       @for f in ${EXTRA_FILES}; do \



Home | Main Index | Thread Index | Old Index