CVS commit: pkgsrc/editors/xemacs-current

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Aug 30 15:02:22 UTC 2023

Modified Files:
        pkgsrc/editors/xemacs-current: Makefile PLIST options.mk

Log Message:
editors/xemacs-current: fix PLIST for enabled LDAP option.

TODO:
* Test build for other options which a PLIST_VAR entry is described for,
  and integrate PLIST if needed.
* Document unknown 'xface' option.
* Address pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/xemacs-current/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/xemacs-current/options.mk

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-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.118 pkgsrc/editors/xemacs-current/Makefile:1.119
--- pkgsrc/editors/xemacs-current/Makefile:1.118        Thu Jun 29 20:57:44 2023
+++ pkgsrc/editors/xemacs-current/Makefile      Wed Aug 30 15:02:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2023/06/29 20:57:44 hauke Exp $
+# $NetBSD: Makefile,v 1.119 2023/08/30 15:02:22 vins Exp $
 
 PKGNAME=       ${DISTNAME}
 PKGREVISION=   3
@@ -7,7 +7,7 @@ COMMENT=        *BETA* XEmacs text editor versi
 .include "Makefile.common"
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
-PKG_SUPPORTED_OPTIONS+=                x11 xft xface
+PKG_SUPPORTED_OPTIONS+=                x11 xft2 xface
 PKG_SUGGESTED_OPTIONS+=                x11
 
 .include "options.mk"

Index: pkgsrc/editors/xemacs-current/PLIST
diff -u pkgsrc/editors/xemacs-current/PLIST:1.28 pkgsrc/editors/xemacs-current/PLIST:1.29
--- pkgsrc/editors/xemacs-current/PLIST:1.28    Thu Jun 29 20:57:44 2023
+++ pkgsrc/editors/xemacs-current/PLIST Wed Aug 30 15:02:22 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2023/06/29 20:57:44 hauke Exp $
+@comment $NetBSD: PLIST,v 1.29 2023/08/30 15:02:22 vins Exp $
 bin/ellcc
 bin/gnuattach
 bin/gnuclient
@@ -1493,6 +1493,7 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/mmencode
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.el
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/auto-autoloads.elc
+${PLIST.ldap}lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules/eldap.ell
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/movemail
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/profile
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/rcs2log

Index: pkgsrc/editors/xemacs-current/options.mk
diff -u pkgsrc/editors/xemacs-current/options.mk:1.20 pkgsrc/editors/xemacs-current/options.mk:1.21
--- pkgsrc/editors/xemacs-current/options.mk:1.20       Sun Oct  3 17:53:11 2021
+++ pkgsrc/editors/xemacs-current/options.mk    Wed Aug 30 15:02:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2021/10/03 17:53:11 hauke Exp $
+# $NetBSD: options.mk,v 1.21 2023/08/30 15:02:22 vins Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=                ldap canna debug
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS+=         ldap canna debu
 .include "../../mk/bsd.options.mk"
 
 # Option "xft" implies "x11".
-.if  empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mxft)
+.if  empty(PKG_OPTIONS:Mx11) && !empty(PKG_OPTIONS:Mxft2)
 PKG_OPTIONS+=          x11
 .endif
 
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=      --with-ldap
 CONFIGURE_ARGS+=       --without-ldap
 .endif
 
-.if !empty(PKG_OPTIONS:Mxft)
+.if !empty(PKG_OPTIONS:Mxft2)
 CONFIGURE_ARGS+=       --with-xft=emacs,tabs,menubars,gauges
 .  include "../../fonts/fontconfig/buildlink3.mk"
 .  include "../../graphics/freetype2/buildlink3.mk"