Fix building on OS X; cosmetic changes; fix distinfo

2 files changed, 29 insertions, 30 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 2803e60f70d..eb717308e46 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,54 +1,54 @@
-# $NetBSD: Makefile,v 1.147 2016/01/01 17:00:49 spz Exp $
-#
+# $NetBSD: Makefile,v 1.148 2016/01/05 17:05:00 adam Exp $
 
-DISTNAME=		sudo-1.8.15
-#PKGREVISION=		0
-CATEGORIES=		security
-MASTER_SITES=		http://www.sudo.ws/dist/ \
-			ftp://ftp.sudo.ws/pub/sudo/ \
-			ftp://ftp.uwsg.indiana.edu/pub/security/sudo/ \
-			ftp://ftp.twaren.net/Unix/Security/Sudo/ \
-			http://ftp.tux.org/pub/security/sudo/
+DISTNAME=	sudo-1.8.15
+CATEGORIES=	security
+MASTER_SITES=	http://www.sudo.ws/dist/ \
+		ftp://ftp.sudo.ws/pub/sudo/ \
+		ftp://ftp.uwsg.indiana.edu/pub/security/sudo/ \
+		ftp://ftp.twaren.net/Unix/Security/Sudo/ \
+		http://ftp.tux.org/pub/security/sudo/
 
-MAINTAINER=		kim@tac.nyc.ny.us
-HOMEPAGE=		http://www.sudo.ws/
-COMMENT=		Allow others to run commands as root
-LICENSE=		isc AND modified-bsd
+MAINTAINER=	kim@tac.nyc.ny.us
+HOMEPAGE=	http://www.sudo.ws/
+COMMENT=	Allow others to run commands as root
+LICENSE=	isc AND modified-bsd
 
 USE_LIBTOOL=		yes
-OWN_DIRS+=		${VARBASE}/run
 GNU_CONFIGURE=		yes
-BUILD_DEFS+=		VARBASE
-PLIST_VARS+=		ldap noexec
-
-.include "../../mk/bsd.prefs.mk"
-
+CONFIGURE_ARGS+=	--disable-path-info
+CONFIGURE_ARGS+=	--disable-root-mailer
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ignore-dot
+CONFIGURE_ARGS+=	--with-nbsdops
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib # for a bunch of shared libs
+CONFIGURE_ARGS+=	--with-rundir=${VARBASE}/run/sudo
+CONFIGURE_ARGS+=	--with-logpath=${VARBASE}/log/sudo.log
 # to always install man instead of cat
 CONFIGURE_ENV+=		NROFFPROG=${CAT:Q}
 CONFIGURE_ENV+=		mansectsu=8
 CONFIGURE_ENV+=		mansectform=5
-CONFIGURE_ARGS+=	--disable-root-mailer --with-ignore-dot
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-rundir=${VARBASE}/run/sudo
-CONFIGURE_ARGS+=	--with-logpath=${VARBASE}/log/sudo.log
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib # for a bunch of shared libs
+
+.include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-noexec=no
+CONFIGURE_ENV+=		ax_cv_check_cflags___static_libgcc=no
 .else
 PLIST.noexec=		yes
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-[7-9].*-*)
-CFLAGS+=		-D_OPENBSD_SOURCE=1
+CFLAGS+=	-D_OPENBSD_SOURCE=1
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-[5-6].*-*)
-CFLAGS+=                -D_INCOMPLETE_XOPEN_C063=1
+CFLAGS+=	-D_INCOMPLETE_XOPEN_C063=1
 .endif
 
 .include "options.mk"
 
-CONFIGURE_ARGS+=	--with-nbsdops --disable-path-info
+OWN_DIRS+=		${VARBASE}/run
+BUILD_DEFS+=		VARBASE
+PLIST_VARS+=		ldap noexec
 
 DOCDIR=			share/doc/${PKGBASE}
 EGDIR=			share/examples/${PKGBASE}
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 0b508d5a5b3..2a5ffb7e7f0 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2016/01/01 17:00:49 spz Exp $
+$NetBSD: distinfo,v 1.85 2016/01/05 17:05:00 adam Exp $
 
 SHA1 (sudo-1.8.15.tar.gz) = acb5ff3f38fa9e0365f6a91a6620b9846e2ad843
 RMD160 (sudo-1.8.15.tar.gz) = 676ee3249c2ddacd64de54d6555b820912b56f6f
@@ -7,7 +7,6 @@ Size (sudo-1.8.15.tar.gz) = 2660128 bytes
 SHA1 (patch-aa) = de75d916f2b2ce9ac24c9b69f99df984fd0c41fe
 SHA1 (patch-af) = 9ef912344d9cd4c3811a4d705d3424cd88621710
 SHA1 (patch-ag) = c62f063ffc9e8fb3fce7c94a8cba531ecb8b76ff
-SHA1 (patch-config.h.in) = 48a6445f5a2525184376ba2d863661d236384cc3
 SHA1 (patch-plugins_sudoers_Makefile.in) = d8612ac7bf2f5a892d9720c4df91810ca807f4ed
 SHA1 (patch-plugins_sudoers_logging.c) = a42e54af2b6057804aecb3b6a48c565e8ac4df82
 SHA1 (patch-src_Makefile.in) = 43f7266d3d106fca69003ee040342c3b201fd262