emacs-git: make it match more with emacs25

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Jul 29 00:11:09 2017 +0200
Changeset:	6e1a2bfa333db64362e6226a8205f3bb67f16820

Modified Files:
	emacs-git/Makefile
Added Files:
	emacs-git/distinfo
	emacs-git/patches/patch-configure.ac

Log Message:
emacs-git: make it match more with emacs25

Also add proposed upstream patch for paxctl removal.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6e1a2bfa333db64362e6226a8205f3bb67f16820

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

diffstat:
 emacs-git/Makefile                   | 52 ++++++++++++++++++------------------
 emacs-git/distinfo                   |  3 +++
 emacs-git/patches/patch-configure.ac | 44 ++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 26 deletions(-)

diffs:
diff --git a/emacs-git/Makefile b/emacs-git/Makefile
index d9d85dbb52..4a50e10525 100644
--- a/emacs-git/Makefile
+++ b/emacs-git/Makefile
@@ -7,45 +7,43 @@ CATEGORIES=	editors
 MASTER_SITES=	#
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
+HOMEPAGE=	https://www.gnu.org/software/emacs/
 COMMENT=	GNU editing macros (development version)
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	autoconf gm4 gmake gsed gzip makeinfo
-# for example, Mac OS X 10.6.1 has 2.61 which fails
-AUTOCONF_REQD=	2.65
-# NetBSD has 4.8
-TEXINFO_REQD=	4.13
-
 GIT_REPOSITORIES=	master
 GIT_MODULE.master=	emacs
 GIT_REPO.master=	git://git.sv.gnu.org/emacs.git
 _GIT_FLAGS?=		--depth 1
 
-GNU_CONFIGURE=		yes
-INFO_FILES=		yes
 WRKSRC=		${WRKDIR}/emacs
 
-CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN:Q}
+GNU_CONFIGURE=	yes
+INFO_FILES=	yes
+USE_TOOLS+=	autoconf automake gm4 gmake gsed gzip makeinfo
+# for example, Mac OS X 10.6.1 has 2.61 which fails
+AUTOCONF_REQD=	2.65
+# NetBSD has 4.8
+TEXINFO_REQD=	4.13
+
+CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ENV+=		GAMEOWN=${GAMES_USER}
 # For wip special, following gives symbol names when back trace is shown.
 CFLAGS+=		-g
-CONFIGURE_ARGS+=	MAKEINFO=${LOCALBASE}/bin/makeinfo
+#CONFIGURE_ARGS+=	MAKEINFO=${LOCALBASE}/bin/makeinfo
+
+USE_GAMESGROUP=		yes
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
-
 PLIST_SRC+=		PLIST
-PLIST_SUBST+=           DISTNAME=${DISTNAME}
-PRINT_PLIST_AWK+=       { gsub(/${PKGVERSION_NOREV}/, "$${PKGVERSION}"); \
-			gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
-			print; next; }
 
-MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-#SPECIAL_PERMS+=		libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM:Q}/update-game-score ${SETGID_GAMES_PERMS}
+MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
 
 .include "options.mk"
 
@@ -53,10 +51,13 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} $
 CHECK_WRKREF_SKIP+=	bin/emacs
 CHECK_WRKREF_SKIP+=	bin/emacs-${PKGVERSION_NOREV}
 
-FILESDIR=	${.CURDIR}/files
+PRINT_PLIST_AWK+=       { gsub(/${PKGVERSION_NOREV}/, "$${PKGVERSION}"); \
+			gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
+			print; next; }
+
 # ./configure.lineno: 3555: Syntax error: Bad substitution
 # And then add another portablity problem ?
-PKGSRC_MAKE_ENV+=       SH=/bin/ksh
+#PKGSRC_MAKE_ENV+=       SH=/bin/ksh
 
 post-extract:
 	# set auto-load for send-pr library
@@ -68,6 +69,5 @@ pre-configure:
 .include "../../wip/mk/git-package.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
-.include "../../mk/oss.buildlink3.mk"
+#.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emacs-git/distinfo b/emacs-git/distinfo
new file mode 100644
index 0000000000..e80e221025
--- /dev/null
+++ b/emacs-git/distinfo
@@ -0,0 +1,3 @@
+$NetBSD$
+
+SHA1 (patch-configure.ac) = 1bbaafbdaf74d802601b055da471e527072c4682
diff --git a/emacs-git/patches/patch-configure.ac b/emacs-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..cab9d15cc0
--- /dev/null
+++ b/emacs-git/patches/patch-configure.ac
@@ -0,0 +1,44 @@
+$NetBSD$
+
+Do not use paxctl on NetBSD-current.
+From Paul Eggert.
+
+--- configure.ac.orig	2017-07-25 05:44:03.000000000 +0000
++++ configure.ac
+@@ -175,6 +175,7 @@ esac
+ 
+ canonical=$host
+ configuration=${host_alias-${build_alias-$host}}
++emacs_uname_r=`uname -r`
+ 
+ dnl Support for --program-prefix, --program-suffix and
+ dnl --program-transform-name options
+@@ -1222,8 +1223,8 @@ if test $opsys = gnu-linux; then
+     AC_SUBST([SETFATTR])
+   fi
+ fi
+-case $opsys,$PAXCTL_notdumped in
+-  gnu-linux, | netbsd,)
++case $opsys,$PAXCTL_notdumped,$emacs_uname_r in
++  gnu-linux,,* | netbsd,,[0-7].*)
+     AC_PATH_PROG([PAXCTL], [paxctl], [],
+       [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
+     if test -n "$PAXCTL"; then
+@@ -5509,13 +5510,12 @@ to run if these resources are not instal
+    echo
+ fi
+ 
+-if test "${opsys}" = "cygwin"; then
+-  case `uname -r` in
+-    1.5.*) AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
++case $opsys,$emacs_uname_r in
++  cygwin,1.5.*)
++    AC_MSG_WARN([[building Emacs on Cygwin 1.5 is not supported.]])
+            echo
+ 	   ;;
+-  esac
+-fi
++esac
+ 
+ # Remove any trailing slashes in these variables.
+ case $prefix in