CVS commit: pkgsrc/editors/emacs28

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 10 08:35:57 UTC 2023

Modified Files:
        pkgsrc/editors/emacs28: Makefile Makefile.common

Log Message:
emacs28: Limit inotify workaround to main package.

Fixes emacs28-nox11 build which disables file notification completely.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/emacs28/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs28/Makefile.common

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

Modified files:

Index: pkgsrc/editors/emacs28/Makefile
diff -u pkgsrc/editors/emacs28/Makefile:1.15 pkgsrc/editors/emacs28/Makefile:1.16
--- pkgsrc/editors/emacs28/Makefile:1.15        Tue Jun  6 08:02:08 2023
+++ pkgsrc/editors/emacs28/Makefile     Tue Oct 10 08:35:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/06 08:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2023/10/10 08:35:57 jperkin Exp $
 
 CONFLICTS+=    emacs28-nox11-[0-9]*
 
@@ -7,6 +7,12 @@ PKGREVISION= 9
 
 .include "options.mk"
 
+# Erroneously tries to enable inotify by default.
+.if ${OPSYS} == "SunOS"
+.  include "../../devel/glib2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-file-notification=gfile
+.endif
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"

Index: pkgsrc/editors/emacs28/Makefile.common
diff -u pkgsrc/editors/emacs28/Makefile.common:1.2 pkgsrc/editors/emacs28/Makefile.common:1.3
--- pkgsrc/editors/emacs28/Makefile.common:1.2  Mon Oct  9 17:09:01 2023
+++ pkgsrc/editors/emacs28/Makefile.common      Tue Oct 10 08:35:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/10/09 17:09:01 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/10/10 08:35:57 jperkin Exp $
 #
 # used by editors/emacs28/Makefile
 # used by editors/emacs28-nox11/Makefile
@@ -32,12 +32,6 @@ CONFIGURE_ARGS+=     --localstatedir=${VARBA
 CONFIGURE_ARGS+=       --disable-autodepend
 CONFIGURE_ENV+=                GAMEOWN=${GAMES_USER}
 
-# Erroneously tries to enable inotify by default.
-.if ${OPSYS} == "SunOS"
-.  include "../../devel/glib2/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-file-notification=gfile
-.endif
-
 USE_GAMESGROUP=                yes
 
 BUILD_DEFS+=           VARBASE