CVS commit: pkgsrc/editors/xemacs-packages

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Jul 21 15:58:35 UTC 2021

Modified Files:
        pkgsrc/editors/xemacs-packages: Makefile

Log Message:
The pkgsrc framework has become more strict, and registering fonts for
installation per FONTS_DIRS.x11 will mandate an X11 dependency.

At this point, only the x-symbol package is concerned. Since it needs
to be able to cope with a non-graphical console anyway, we install it
unconditionally, skip the PLIST dance, and just depend the font
registration on X11 availabiluty.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/editors/xemacs-packages/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs-packages/Makefile
diff -u pkgsrc/editors/xemacs-packages/Makefile:1.76 pkgsrc/editors/xemacs-packages/Makefile:1.77
--- pkgsrc/editors/xemacs-packages/Makefile:1.76        Mon May 24 19:52:09 2021
+++ pkgsrc/editors/xemacs-packages/Makefile     Wed Jul 21 15:58:35 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.76 2021/05/24 19:52:09 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2021/07/21 15:58:35 hauke Exp $
 
 DISTNAME=      xemacs-packages
 PKGNAME=       xemacs-packages-1.18
-PKGREVISION=   6
+PKGREVISION=   7
 
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/}
@@ -166,9 +166,18 @@ XEPKGDIR=  lib/xemacs/xemacs-packages
 
 INSTALLATION_DIRS+=    ${XEPKGDIR}
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xemacs-packages
+PKG_SUPPORTED_OPTIONS+=        x11
+PKG_SUGGESTED_OPTIONS+=        x11
+
+.include "../../mk/bsd.options.mk"
+
+# Only attemppt to register fonts if we have X11 support
+.if !empty(PKG_OPTIONS:Mx11)
 FONTS_DIRS.x11+=       ${PREFIX}/${XEPKGDIR}/etc/x-symbol/fonts
 FONTS_DIRS.x11+=       ${PREFIX}/${XEPKGDIR}/etc/x-symbol/origfonts
 FONTS_DIRS.x11+=       ${PREFIX}/${XEPKGDIR}/etc/x-symbol/pcf
+.endif
 
 REPLACE_PERL=          etc/bbdb/bbdb-areacode-split.pl
 REPLACE_PERL+=         etc/bbdb/bbdb-cid.pl
@@ -233,8 +242,11 @@ pre-configure:
        ${CHMOD} ugo-x ${WRKSRC}/lisp/erc/ChangeLog.2005.upstream
        ${FIND} ${WRKSRC} -type f -and -perm -100 \
                -and \( -name "*.el" -or -name "*.gif" -or -name "*.jar" \) \
-               -exec ${CHMOD} ugo-x \{\} \;
+               -exec ${CHMOD} ugo-x \{\} \+
        @${ECHO_MSG} "done"
+.if empty(PKG_OPTIONS:Mx11)
+       ${RM} ${WRKSRC}/etc/x-symbol/pcf/fonts.dir
+.endif
        @${ECHO_MSG} "Re-compiling patched elisp files ... "
        for ff in `cat ${PATCHDIR}/*.el | awk '/^\\+\\+\\+/ { print $$2 }'` ; do \
                ${RM} -f ${WRKSRC}/$${ff}.orig ; \