Received: by mail.netbsd.org (Postfix, from userid 605) id E370B84CD9; Sun, 3 Oct 2021 17:53:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2689D84CBC for ; Sun, 3 Oct 2021 17:53:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id yCmOrTpx7Go9 for ; Sun, 3 Oct 2021 17:53:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EB23184C71 for ; Sun, 3 Oct 2021 17:53:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EA23BFA97; Sun, 3 Oct 2021 17:53:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1633283591194740" MIME-Version: 1.0 Date: Sun, 3 Oct 2021 17:53:11 +0000 From: "Hauke Fath" Subject: CVS commit: pkgsrc/editors To: pkgsrc-changes@NetBSD.org Reply-To: hauke@netbsd.org X-Mailer: log_accum Message-Id: <20211003175311.EA23BFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1633283591194740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: hauke Date: Sun Oct 3 17:53:11 UTC 2021 Modified Files: pkgsrc/editors/xemacs: Makefile Makefile.common options.mk pkgsrc/editors/xemacs-current: Makefile Makefile.common options.mk pkgsrc/editors/xemacs-current-nox11: Makefile pkgsrc/editors/xemacs-nox11: Makefile Log Message: For the sake of MKPIE, we need to .include Makefile.common before options.mk. Since Makefile.common now does not see the x11 option, we have to move all x11 related commands into options.mk. Within options, move .includes to the end for consistency. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 pkgsrc/editors/xemacs/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/editors/xemacs/Makefile.common cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/xemacs/options.mk cvs rdiff -u -r1.110 -r1.111 pkgsrc/editors/xemacs-current/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/editors/xemacs-current/Makefile.common cvs rdiff -u -r1.19 -r1.20 pkgsrc/editors/xemacs-current/options.mk cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/xemacs-current-nox11/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/editors/xemacs-nox11/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1633283591194740 Content-Disposition: inline Content-Length: 11366 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/xemacs/Makefile diff -u pkgsrc/editors/xemacs/Makefile:1.136 pkgsrc/editors/xemacs/Makefile:1.137 --- pkgsrc/editors/xemacs/Makefile:1.136 Sun Oct 3 09:22:28 2021 +++ pkgsrc/editors/xemacs/Makefile Sun Oct 3 17:53:11 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.136 2021/10/03 09:22:28 nia Exp $ +# $NetBSD: Makefile,v 1.137 2021/10/03 17:53:11 hauke Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 17 +PKGREVISION= 18 COMMENT= XEmacs text editor version 21.4 .include "Makefile.common" @@ -12,13 +12,4 @@ PKG_SUGGESTED_OPTIONS+= x11 .include "options.mk" -SUBST_CLASSES+= desktop-file -SUBST_STAGE.desktop-file= pre-configure -SUBST_MESSAGE.desktop-file= Fixing paths in XEmacs desktop file -SUBST_VARS.desktop-file= PREFIX LIBDIR -SUBST_FILES.desktop-file= etc/xemacs.desktop - -INSTALLATION_DIRS+= share/applications - -.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/xemacs/Makefile.common diff -u pkgsrc/editors/xemacs/Makefile.common:1.37 pkgsrc/editors/xemacs/Makefile.common:1.38 --- pkgsrc/editors/xemacs/Makefile.common:1.37 Mon Sep 27 15:57:32 2021 +++ pkgsrc/editors/xemacs/Makefile.common Sun Oct 3 17:53:11 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.37 2021/09/27 15:57:32 nia Exp $ +# $NetBSD: Makefile.common,v 1.38 2021/10/03 17:53:11 hauke Exp $ # # used by editors/xemacs-nox11/Makefile # used by editors/xemacs/Makefile @@ -97,25 +97,18 @@ INSTALL_MAKE_FLAGS+= sitemoduledir=${DES INSTALL_MAKE_FLAGS+= TAR=${TOOLS_PATH.gtar} -post-extract: +post-extract: post-extract-x11 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/ -.if !empty(PKG_OPTIONS:Mx11) - cp ${FILESDIR}/xemacs.desktop ${WRKSRC}/etc/ -.endif pre-build: rm -f ${WRKSRC}/etc/ctags.1.orig rm -f ${WRKSRC}/lisp/gui.el.orig -post-install: +post-install: post-install-x11 ${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/ .if defined(MANZ) find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD} .endif -.if !empty(PKG_OPTIONS:Mx11) - ${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \ - ${DESTDIR}${PREFIX}/share/applications/ -.endif .include "../../databases/gdbm/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" Index: pkgsrc/editors/xemacs/options.mk diff -u pkgsrc/editors/xemacs/options.mk:1.17 pkgsrc/editors/xemacs/options.mk:1.18 --- pkgsrc/editors/xemacs/options.mk:1.17 Sat Jun 8 10:41:00 2019 +++ pkgsrc/editors/xemacs/options.mk Sun Oct 3 17:53:11 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2019/06/08 10:41:00 rillig Exp $ +# $NetBSD: options.mk,v 1.18 2021/10/03 17:53:11 hauke Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS+= ldap canna debug @@ -10,12 +10,6 @@ PKG_SUPPORTED_OPTIONS+= ldap canna debu ### PLIST_VARS+= x11 .if !empty(PKG_OPTIONS:Mx11) -. include "../../mk/jpeg.buildlink3.mk" -. include "../../graphics/png/buildlink3.mk" -. include "../../graphics/tiff/buildlink3.mk" -. include "../../x11/libXpm/buildlink3.mk" -. include "../../mk/xaw.buildlink3.mk" -. include "../../x11/xbitmaps/buildlink3.mk" PLIST.x11= yes CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-jpeg @@ -34,6 +28,29 @@ CONFIGURE_ARGS+= --with-dialogs=athena CONFIGURE_ARGS+= --with-widgets=athena CONFIGURE_ARGS+= --with-athena=xaw CONFIGURE_ARGS+= --with-xim=xlib + +SUBST_CLASSES+= desktop-file +SUBST_STAGE.desktop-file= pre-configure +SUBST_MESSAGE.desktop-file= Fixing paths in XEmacs desktop file +SUBST_VARS.desktop-file= PREFIX LIBDIR +SUBST_FILES.desktop-file= etc/xemacs.desktop + +INSTALLATION_DIRS+= share/applications + +post-extract-x11: + cp ${FILESDIR}/xemacs.desktop ${WRKSRC}/etc/ + +post-install-x11: + ${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \ + ${DESTDIR}${PREFIX}/share/applications/ + +. include "../../sysutils/desktop-file-utils/desktopdb.mk" +. include "../../mk/jpeg.buildlink3.mk" +. include "../../graphics/png/buildlink3.mk" +. include "../../graphics/tiff/buildlink3.mk" +. include "../../x11/libXpm/buildlink3.mk" +. include "../../mk/xaw.buildlink3.mk" +. include "../../x11/xbitmaps/buildlink3.mk" .else CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-jpeg @@ -43,6 +60,10 @@ CONFIGURE_ARGS+= --without-xpm CONFIGURE_ARGS+= --site-includes=${PREFIX}/include CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib CONFIGURE_ARGS+= --site-runtime-libraries=${PREFIX}/lib + +# Nothing to do +post-extract-x11: +post-install-x11: .endif .if !empty(PKG_OPTIONS:Mldap) @@ -61,8 +82,8 @@ CONFIGURE_ARGS+= --without-xface PLIST_VARS+= canna .if !empty(PKG_OPTIONS:Mcanna) -. include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-canna +. include "../../inputmethod/canna-lib/buildlink3.mk" PLIST.canna= yes .else CONFIGURE_ARGS+= --without-canna Index: pkgsrc/editors/xemacs-current/Makefile diff -u pkgsrc/editors/xemacs-current/Makefile:1.110 pkgsrc/editors/xemacs-current/Makefile:1.111 --- pkgsrc/editors/xemacs-current/Makefile:1.110 Sun Oct 3 09:22:28 2021 +++ pkgsrc/editors/xemacs-current/Makefile Sun Oct 3 17:53:11 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.110 2021/10/03 09:22:28 nia Exp $ +# $NetBSD: Makefile,v 1.111 2021/10/03 17:53:11 hauke Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 17 +PKGREVISION= 18 COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} .include "Makefile.common" @@ -12,15 +12,4 @@ PKG_SUGGESTED_OPTIONS+= x11 .include "options.mk" -LIBDIR= ${PREFIX}/lib/${DISTNAME} - -SUBST_CLASSES+= desktop-file -SUBST_STAGE.desktop-file= pre-configure -SUBST_MESSAGE.desktop-file= Fixing paths in XEmacs desktop file -SUBST_VARS.desktop-file= PREFIX LIBDIR -SUBST_FILES.desktop-file= etc/xemacs.desktop - -INSTALLATION_DIRS+= share/applications - -.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/xemacs-current/Makefile.common diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.18 pkgsrc/editors/xemacs-current/Makefile.common:1.19 --- pkgsrc/editors/xemacs-current/Makefile.common:1.18 Mon Sep 27 15:58:33 2021 +++ pkgsrc/editors/xemacs-current/Makefile.common Sun Oct 3 17:53:11 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2021/09/27 15:58:33 nia Exp $ +# $NetBSD: Makefile.common,v 1.19 2021/10/03 17:53:11 hauke Exp $ # # used by editors/xemacs-current/Makefile # used by editors/xemacs-current-nox11/Makefile @@ -62,15 +62,6 @@ INSTALL_MAKE_FLAGS+= TAR=${TOOLS_PATH.gt CPPFLAGS+= -DTERMINFO .endif -.if !empty(PKG_OPTIONS:Mx11) -post-extract: - cp ${.CURDIR}/../../editors/xemacs/files/xemacs.desktop ${WRKSRC}/etc/ - -post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \ - ${DESTDIR}${PREFIX}/share/applications/ -.endif - .include "../../databases/gdbm/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" Index: pkgsrc/editors/xemacs-current/options.mk diff -u pkgsrc/editors/xemacs-current/options.mk:1.19 pkgsrc/editors/xemacs-current/options.mk:1.20 --- pkgsrc/editors/xemacs-current/options.mk:1.19 Sun Nov 29 19:52:26 2020 +++ pkgsrc/editors/xemacs-current/options.mk Sun Oct 3 17:53:11 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2020/11/29 19:52:26 nia Exp $ +# $NetBSD: options.mk,v 1.20 2021/10/03 17:53:11 hauke Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS+= ldap canna debug @@ -15,12 +15,6 @@ PKG_OPTIONS+= x11 ### PLIST_VARS+= x11 .if !empty(PKG_OPTIONS:Mx11) -. include "../../mk/jpeg.buildlink3.mk" -. include "../../graphics/png/buildlink3.mk" -. include "../../graphics/tiff/buildlink3.mk" -. include "../../x11/libXpm/buildlink3.mk" -. include "../../mk/xaw.buildlink3.mk" -. include "../../x11/xbitmaps/buildlink3.mk" PLIST.x11= yes CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-jpeg @@ -42,7 +36,33 @@ CONFIGURE_ARGS+= --with-xim=xlib # Explicitly exclude other toolkits CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --without-gnome + +LIBDIR= ${PREFIX}/lib/${DISTNAME} + +SUBST_CLASSES+= desktop-file +SUBST_STAGE.desktop-file= pre-configure +SUBST_MESSAGE.desktop-file= Fixing paths in XEmacs desktop file +SUBST_VARS.desktop-file= PREFIX LIBDIR +SUBST_FILES.desktop-file= etc/xemacs.desktop + +INSTALLATION_DIRS+= share/applications + +post-extract: + cp ${.CURDIR}/../../editors/xemacs/files/xemacs.desktop ${WRKSRC}/etc/ + +post-install: + ${INSTALL_DATA} ${WRKSRC}/etc/xemacs.desktop \ + ${DESTDIR}${PREFIX}/share/applications/ + +. include "../../sysutils/desktop-file-utils/desktopdb.mk" +. include "../../mk/jpeg.buildlink3.mk" +. include "../../graphics/png/buildlink3.mk" +. include "../../graphics/tiff/buildlink3.mk" +. include "../../x11/libXpm/buildlink3.mk" +. include "../../mk/xaw.buildlink3.mk" +. include "../../x11/xbitmaps/buildlink3.mk" .else + CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-jpeg CONFIGURE_ARGS+= --without-png @@ -63,11 +83,11 @@ CONFIGURE_ARGS+= --without-ldap .endif .if !empty(PKG_OPTIONS:Mxft) +CONFIGURE_ARGS+= --with-xft=emacs,tabs,menubars,gauges . include "../../fonts/fontconfig/buildlink3.mk" . include "../../graphics/freetype2/buildlink3.mk" . include "../../x11/libXft/buildlink3.mk" . include "../../x11/libXrender/buildlink3.mk" -CONFIGURE_ARGS+= --with-xft=emacs,tabs,menubars,gauges .else CONFIGURE_ARGS+= --without-xft .endif @@ -81,8 +101,8 @@ CONFIGURE_ARGS+= --without-xface PLIST_VARS+= canna .if !empty(PKG_OPTIONS:Mcanna) -. include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-canna +. include "../../inputmethod/canna-lib/buildlink3.mk" PLIST.canna= yes .else CONFIGURE_ARGS+= --without-canna Index: pkgsrc/editors/xemacs-current-nox11/Makefile diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.13 pkgsrc/editors/xemacs-current-nox11/Makefile:1.14 --- pkgsrc/editors/xemacs-current-nox11/Makefile:1.13 Sun Mar 28 10:36:33 2021 +++ pkgsrc/editors/xemacs-current-nox11/Makefile Sun Oct 3 17:53:11 2021 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2021/03/28 10:36:33 hauke Exp $ +# $NetBSD: Makefile,v 1.14 2021/10/03 17:53:11 hauke Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 9 -COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support) +PKGREVISION= 10 +COMMENT= *BETA* XEmacs text editor version 21.5 (no X11 support) -.include "../../editors/xemacs-current/options.mk" .include "../../editors/xemacs-current/Makefile.common" +.include "../../editors/xemacs-current/options.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/xemacs-nox11/Makefile diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.37 pkgsrc/editors/xemacs-nox11/Makefile:1.38 --- pkgsrc/editors/xemacs-nox11/Makefile:1.37 Sun Mar 28 10:36:33 2021 +++ pkgsrc/editors/xemacs-nox11/Makefile Sun Oct 3 17:53:11 2021 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.37 2021/03/28 10:36:33 hauke Exp $ +# $NetBSD: Makefile,v 1.38 2021/10/03 17:53:11 hauke Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 15 -COMMENT= XEmacs text editor version 21 (no x11 support) - -.include "../../editors/xemacs/options.mk" +PKGREVISION= 16 +COMMENT= XEmacs text editor version 21.4 (no x11 support) .include "../../editors/xemacs/Makefile.common" +.include "../../editors/xemacs/options.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1633283591194740--