[pkgsrc/trunk]: pkgsrc/editors Fix xemacs packages to honor PKGINFODIR in the...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/editors Fix xemacs packages to honor PKGINFODIR in the...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:13:24 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7343804c06f0
branches:  trunk
changeset: 509972:7343804c06f0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 20 18:21:29 2006 +0000

description:
Fix xemacs packages to honor PKGINFODIR in the default INFOPATH when
reading info files.  Also strip the split info files from the PLIST
as the plist module handles them automatically.  Lastly, define
INFO_FILES so that the pkginstall framework properly manages the "dir"
info file database index in the xemacs info directory.

Bump the PKGREVISION.

diffstat:

 editors/xemacs-current/Makefile |   7 ++++---
 editors/xemacs-current/PLIST    |  26 +-------------------------
 editors/xemacs-nox11/Makefile   |   4 ++--
 editors/xemacs/Makefile         |   5 ++---
 editors/xemacs/Makefile.common  |   8 ++++++--
 editors/xemacs/PLIST            |  20 +-------------------
 6 files changed, 16 insertions(+), 54 deletions(-)

diffs (198 lines):

diff -r 555f6c199a77 -r 7343804c06f0 editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Mon Mar 20 18:15:37 2006 +0000
+++ b/editors/xemacs-current/Makefile   Mon Mar 20 18:21:29 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/02/05 23:08:59 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2006/03/20 18:21:29 jlam Exp $
 
 DISTNAME=      xemacs-21.5.19
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=xemacs-21.5/}
@@ -42,7 +42,7 @@
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-INFOPATH=      ${PREFIX}/info:${X11BASE}/info:/usr/local/info
+INFOPATH=      ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
 
 HAS_CONFIGURE=         YES
 CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
@@ -58,6 +58,7 @@
 CONFIGURE_ARGS+=       --site-libraries=${PREFIX}/lib
 
 CFLAGS+=               -Dunix
+INFO_FILES=            # PLIST
 
 post-patch:
        @${RM} -f ${WRKSRC}/etc/ctags.1.orig
diff -r 555f6c199a77 -r 7343804c06f0 editors/xemacs-current/PLIST
--- a/editors/xemacs-current/PLIST      Mon Mar 20 18:15:37 2006 +0000
+++ b/editors/xemacs-current/PLIST      Mon Mar 20 18:21:29 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/03/02 22:05:19 magick Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/03/20 18:21:29 jlam Exp $
 bin/${EMACSVER}
 bin/ellcc
 bin/gnuattach
@@ -854,43 +854,19 @@
 lib/${EMACSVER}/info/beta.info
 lib/${EMACSVER}/info/cl.info
 lib/${EMACSVER}/info/custom.info
-lib/${EMACSVER}/info/dir
 lib/${EMACSVER}/info/emodules.info
 lib/${EMACSVER}/info/external-widget.info
 lib/${EMACSVER}/info/info.info
 lib/${EMACSVER}/info/internals.info
-lib/${EMACSVER}/info/internals.info-1
-lib/${EMACSVER}/info/internals.info-2
-lib/${EMACSVER}/info/internals.info-3
-lib/${EMACSVER}/info/internals.info-4
-lib/${EMACSVER}/info/internals.info-5
 lib/${EMACSVER}/info/lispref.info
-lib/${EMACSVER}/info/lispref.info-1
-lib/${EMACSVER}/info/lispref.info-2
-lib/${EMACSVER}/info/lispref.info-3
-lib/${EMACSVER}/info/lispref.info-4
-lib/${EMACSVER}/info/lispref.info-5
-lib/${EMACSVER}/info/lispref.info-6
-lib/${EMACSVER}/info/lispref.info-7
-lib/${EMACSVER}/info/lispref.info-8
-lib/${EMACSVER}/info/lispref.info-9
-lib/${EMACSVER}/info/lispref.info-10
 lib/${EMACSVER}/info/new-users-guide.info
 lib/${EMACSVER}/info/standards.info
 lib/${EMACSVER}/info/term.info
 lib/${EMACSVER}/info/termcap.info
 lib/${EMACSVER}/info/texinfo.info
-lib/${EMACSVER}/info/texinfo.info-1
-lib/${EMACSVER}/info/texinfo.info-2
 lib/${EMACSVER}/info/widget.info
 lib/${EMACSVER}/info/xemacs-faq.info
-lib/${EMACSVER}/info/xemacs-faq.info-1
-lib/${EMACSVER}/info/xemacs-faq.info-2
 lib/${EMACSVER}/info/xemacs.info
-lib/${EMACSVER}/info/xemacs.info-1
-lib/${EMACSVER}/info/xemacs.info-2
-lib/${EMACSVER}/info/xemacs.info-3
-lib/${EMACSVER}/info/xemacs.info-4
 lib/${EMACSVER}/lisp/ChangeLog
 lib/${EMACSVER}/lisp/ChangeLog.GTK
 lib/${EMACSVER}/lisp/README
diff -r 555f6c199a77 -r 7343804c06f0 editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Mon Mar 20 18:15:37 2006 +0000
+++ b/editors/xemacs-nox11/Makefile     Mon Mar 20 18:21:29 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:59 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/20 18:21:29 jlam Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/xemacs/xemacs-nox11/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 MAINTAINER=    magick%NetBSD.org@localhost
 
diff -r 555f6c199a77 -r 7343804c06f0 editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Mon Mar 20 18:15:37 2006 +0000
+++ b/editors/xemacs/Makefile   Mon Mar 20 18:21:29 2006 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.79 2006/02/05 23:08:59 joerg Exp $
+# $NetBSD: Makefile,v 1.80 2006/03/20 18:21:29 jlam Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
 MAINTAINER=    uebayasi%NetBSD.org@localhost
-PKGREVISION=   1
-
+PKGREVISION=   2
 
 CONFIGURE_ARGS+=       --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
 CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
diff -r 555f6c199a77 -r 7343804c06f0 editors/xemacs/Makefile.common
--- a/editors/xemacs/Makefile.common    Mon Mar 20 18:15:37 2006 +0000
+++ b/editors/xemacs/Makefile.common    Mon Mar 20 18:21:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/03/20 18:21:29 jlam Exp $
 
 DISTNAME=      xemacs-21.4.17
 CATEGORIES=    editors
@@ -18,7 +18,9 @@
 EXTRA_FILES=   ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUBST+=  DISTNAME=${DISTNAME:Q}
+FILES_SUBST+=  DISTNAME=${DISTNAME:Q}
 MESSAGE_SUBST+=        DISTNAME="${DISTNAME}"
+INFO_FILES=    # PLIST
 
 .include "options.mk"
 
@@ -79,7 +81,7 @@
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
-INFOPATH=      ${PREFIX}/info:${X11BASE}/info:/usr/local/info
+INFOPATH=      ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
 
 HAS_CONFIGURE=         YES
 CONFIGURE_ARGS+=       ${MACHINE_GNU_PLATFORM}
@@ -95,6 +97,8 @@
 
 CFLAGS+=               -Dunix
 
+CHECK_WRKREF_SKIP=     ${PREFIX}/bin/xemacs*
+
 post-extract:
        @for f in ${EXTRA_FILES}; do \
                ${GTAR} xzCf ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/$$f; \
diff -r 555f6c199a77 -r 7343804c06f0 editors/xemacs/PLIST
--- a/editors/xemacs/PLIST      Mon Mar 20 18:15:37 2006 +0000
+++ b/editors/xemacs/PLIST      Mon Mar 20 18:21:29 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/04/25 17:23:50 magick Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/03/20 18:21:29 jlam Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -755,37 +755,19 @@
 lib/${DISTNAME}/etc/xemacs.xpm
 lib/${DISTNAME}/info/cl.info
 lib/${DISTNAME}/info/custom.info
-lib/${DISTNAME}/info/dir
 lib/${DISTNAME}/info/emodules.info
 lib/${DISTNAME}/info/external-widget.info
 lib/${DISTNAME}/info/info.info
 lib/${DISTNAME}/info/internals.info
-lib/${DISTNAME}/info/internals.info-1
-lib/${DISTNAME}/info/internals.info-2
 lib/${DISTNAME}/info/lispref.info
-lib/${DISTNAME}/info/lispref.info-1
-lib/${DISTNAME}/info/lispref.info-2
-lib/${DISTNAME}/info/lispref.info-3
-lib/${DISTNAME}/info/lispref.info-4
-lib/${DISTNAME}/info/lispref.info-5
-lib/${DISTNAME}/info/lispref.info-6
-lib/${DISTNAME}/info/lispref.info-7
-lib/${DISTNAME}/info/lispref.info-8
-lib/${DISTNAME}/info/lispref.info-9
 lib/${DISTNAME}/info/new-users-guide.info
 lib/${DISTNAME}/info/standards.info
 lib/${DISTNAME}/info/term.info
 lib/${DISTNAME}/info/termcap.info
 lib/${DISTNAME}/info/texinfo.info
-lib/${DISTNAME}/info/texinfo.info-1
-lib/${DISTNAME}/info/texinfo.info-2
 lib/${DISTNAME}/info/widget.info
 lib/${DISTNAME}/info/xemacs-faq.info
 lib/${DISTNAME}/info/xemacs.info
-lib/${DISTNAME}/info/xemacs.info-1
-lib/${DISTNAME}/info/xemacs.info-2
-lib/${DISTNAME}/info/xemacs.info-3
-lib/${DISTNAME}/info/xemacs.info-4
 lib/${DISTNAME}/lisp/ChangeLog
 lib/${DISTNAME}/lisp/ChangeLog.1
 lib/${DISTNAME}/lisp/ChangeLog.GTK
Prev by Date: [pkgsrc/trunk]: pkgsrc/sysutils/findutils * Honor PKGINFODIR and PKGMANDIR, a...
Next by Date: [pkgsrc/trunk]: pkgsrc/x11 Fix CVE-2006-0745: Comparing the address of geteui...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/findutils * Honor PKGINFODIR and PKGMANDIR, a...
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11 Fix CVE-2006-0745: Comparing the address of geteui...
Indexes:
Home | Main Index | Thread Index | Old Index