emacs-current: remove patches, merged upstream.

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue May 3 08:12:27 2016 +0200
Changeset:	4876e38095dd457248cae0edbcf61855e899deaa

Removed Files:
	emacs-current/distinfo
	emacs-current/patches/patch-configure.ac
	emacs-current/patches/patch-src_Makefile.in

Log Message:
emacs-current: remove patches, merged upstream.

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

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

diffstat:
 emacs-current/distinfo                      |  4 --
 emacs-current/patches/patch-configure.ac    | 73 -----------------------------
 emacs-current/patches/patch-src_Makefile.in | 61 ------------------------
 3 files changed, 138 deletions(-)

diffs:
diff --git a/emacs-current/distinfo b/emacs-current/distinfo
deleted file mode 100644
index 20806c0..0000000
--- a/emacs-current/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-configure.ac) = 831b0521a2c69ef1efa2c6b9c2aca0d1ebaca88f
-SHA1 (patch-src_Makefile.in) = eb27f2ccd7864a95db5ec8f84ca5f87c238dea21
diff --git a/emacs-current/patches/patch-configure.ac b/emacs-current/patches/patch-configure.ac
deleted file mode 100644
index 1c6444c..0000000
--- a/emacs-current/patches/patch-configure.ac
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD$
-
-Problem reported by Thomas Klausner (Bug#23371).
-* configure.ac (PAXCTL_dumped, PAXCTL_notdumped): New vars.
-Set them to setfattr and/or paxctl commands appropriate for
-GNU/Linux and/or NetBSD; the latter prefers paxctl +a.  Search
-for paxctl only if setfattr is not found.
-* src/Makefile.in (PAXCTL_dumped, PAXCTL_notdumped):
-New vars, replacing PAXCTL_if_present and SETFATTR_if_present.
-All uses changed.
-
---- configure.ac.orig	2016-04-22 16:23:52.000000000 +0000
-+++ configure.ac
-@@ -1159,16 +1159,9 @@ AC_PATH_PROG(GZIP_PROG, gzip)
- test $with_compress_install != yes && test -n "$GZIP_PROG" && \
-    GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)"
- 
-+PAXCTL_dumped=
-+PAXCTL_notdumped=
- if test $opsys = gnu-linux; then
--  AC_PATH_PROG(PAXCTL, paxctl,,
--    [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
--  if test "X$PAXCTL" != X; then
--    AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
--      [if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then AC_MSG_RESULT(yes)
--      else AC_MSG_RESULT(no); PAXCTL=""; fi])
--  fi
--
-   if test "${SETFATTR+set}" != set; then
-     AC_CACHE_CHECK([for setfattr],
-       [emacs_cv_prog_setfattr],
-@@ -1179,6 +1172,7 @@ if test $opsys = gnu-linux; then
- 	 emacs_cv_prog_setfattr=no
-        fi])
-     if test "$emacs_cv_prog_setfattr" = yes; then
-+      PAXCTL_notdumped='$(SETFATTR) -n user.pax.flags -v er'
-       SETFATTR=setfattr
-     else
-       SETFATTR=
-@@ -1187,6 +1181,32 @@ if test $opsys = gnu-linux; then
-     AC_SUBST([SETFATTR])
-   fi
- fi
-+case $opsys,$PAXCTL_notdumped in
-+  gnu-linux, | netbsd,)
-+    AC_PATH_PROG([PAXCTL], [paxctl], [],
-+      [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin])
-+    if test -n "$PAXCTL"; then
-+      if test "$opsys" = netbsd; then
-+	PAXCTL_dumped='$(PAXCTL) +a'
-+	PAXCTL_notdumped='$(PAXCTL) +a'
-+      else
-+	AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header])
-+	AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-+	  [if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then
-+	     AC_MSG_RESULT([yes])
-+	   else
-+	     AC_MSG_RESULT([no])
-+	     PAXCTL=
-+	   fi])
-+	if test -n "$PAXCTL"; then
-+	  PAXCTL_dumped='$(PAXCTL) -zex'
-+	  PAXCTL_notdumped='$(PAXCTL) -r'
-+	fi
-+      fi
-+    fi;;
-+esac
-+AC_SUBST([PAXCTL_dumped])
-+AC_SUBST([PAXCTL_notdumped])
- 
- ## Need makeinfo >= 4.7 (?) to build the manuals.
- if test "$MAKEINFO" != "no"; then
diff --git a/emacs-current/patches/patch-src_Makefile.in b/emacs-current/patches/patch-src_Makefile.in
deleted file mode 100644
index d7e3d51..0000000
--- a/emacs-current/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-Problem reported by Thomas Klausner (Bug#23371).
-* configure.ac (PAXCTL_dumped, PAXCTL_notdumped): New vars.
-Set them to setfattr and/or paxctl commands appropriate for
-GNU/Linux and/or NetBSD; the latter prefers paxctl +a.  Search
-for paxctl only if setfattr is not found.
-* src/Makefile.in (PAXCTL_dumped, PAXCTL_notdumped):
-New vars, replacing PAXCTL_if_present and SETFATTR_if_present.
-All uses changed.
-
---- src/Makefile.in.orig	2016-04-17 20:51:40.000000000 +0000
-+++ src/Makefile.in
-@@ -114,8 +114,9 @@ TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(L
- ## around this, newer ones setfattr.  See Bug#11398 and Bug#16343.
- PAXCTL = @PAXCTL@
- SETFATTR = @SETFATTR@
--PAXCTL_if_present = $(or $(PAXCTL),: paxctl)
--SETFATTR_if_present = $(or $(SETFATTR),: setfattr)
-+## Commands to set PaX flags on dumped and not-dumped instances of Emacs.
-+PAXCTL_dumped = @PAXCTL_dumped@
-+PAXCTL_notdumped = @PAXCTL_notdumped@
- 
- ## Some systems define this to request special libraries.
- LIBS_SYSTEM=@LIBS_SYSTEM@
-@@ -542,8 +543,10 @@ ifeq ($(CANNOT_DUMP),yes)
- 	ln -f temacs$(EXEEXT) $@
- else
- 	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
--	$(PAXCTL_if_present) -zex $@
-+ifneq ($(PAXCTL_dumped),)
-+	$(PAXCTL_dumped) $@
-+endif
- 	ln -f $@ bootstrap-emacs$(EXEEXT)
- endif
- 
- ## We run make-docfile twice because the command line may get too long
-@@ -606,8 +612,9 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) 
- 	  -o temacs $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES)
- 	$(MKDIR_P) $(etc)
- ifneq ($(CANNOT_DUMP),yes)
--	$(PAXCTL_if_present) -r $@
--	$(SETFATTR_if_present) -n user.pax.flags -v er $@
-+  ifneq ($(PAXCTL_notdumped),)
-+	$(PAXCTL_notdumped) $@
-+  endif
- endif
- 
- ## The following oldxmenu-related rules are only (possibly) used if
-@@ -748,8 +755,10 @@ ifeq ($(CANNOT_DUMP),yes)
- 	ln -f temacs$(EXEEXT) $@
- else
- 	$(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
--	$(PAXCTL_if_present) -zex emacs$(EXEEXT)
-+ifneq ($(PAXCTL_dumped),)
-+	$(PAXCTL_dumped) emacs$(EXEEXT)
-+endif
- 	mv -f emacs$(EXEEXT) $@
- endif
- 	@: Compile some files earlier to speed up further compilation.
- 	$(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)"