Import of pkgsrc-2016Q3

editors/emacs23/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2015/08/18 07:31:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/03 10:22:40 adam Exp $
 
 CONFLICTS+=	emacs23-nox11-[0-9]*
 
 .include "../../editors/emacs23/Makefile.common"
-PKGREVISION=	32
+PKGREVISION=	38
 
 .include "options.mk"
 

editors/emacs23/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2015/09/07 12:02:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.7 2016/02/25 12:22:40 jperkin Exp $
 #
 # used by editors/emacs23/Makefile
 # used by editors/emacs23-nox11/Makefile
@@ -53,12 +53,10 @@ CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "Darwin")
 # Disable address randomization to fix build with Xcode 4.1.  This is from
 # upstream bug #8395.  Details in:
 # http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html
-CFLAGS+=		-fno-pie
-.endif
+CFLAGS.Darwin+=		-fno-pie
 
 .if (${OPSYS} == "NetBSD") && \
     !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)

editors/emacs23/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2014/07/10 02:25:10 taca Exp $
+$NetBSD: distinfo,v 1.6 2015/11/03 03:32:15 agc Exp $
 
 SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
 RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
+SHA512 (emacs-23.4.tar.gz) = ebd1ffbf1d93559896d8d756a5f8e6c909f32e346f8e9e13e25cf408513bfaf010bca9020c63c08497a37fe4079a313e25581d14d7c1391cc81615d4f84b30a8
 Size (emacs-23.4.tar.gz) = 47721193 bytes
 SHA1 (patch-aa) = 57c7f47843ee17a8761678b38701d6236108a6e0
 SHA1 (patch-ab) = d8b8cdaf3cc63be042a9972392740c5eccc06d49

editors/emacs23/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/05/31 15:56:26 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2016/05/31 09:58:24 jperkin Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -7,7 +7,9 @@ PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
 PKG_OPTIONS_GROUP.window-system= x11 nextstep
 PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
 PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
-PKG_SUGGESTED_OPTIONS=	dbus svg x11 xft2
+PKG_SUGGESTED_OPTIONS.Darwin=	nextstep
+PKG_SUGGESTED_OPTIONS.*=	x11
+PKG_SUGGESTED_OPTIONS+=		dbus svg xft2
 
 .include "../../mk/bsd.options.mk"