Import of pkgsrc-2015Q1

security/mhash/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/05/31 12:41:52 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/03/05 22:28:37 tnn Exp $
 
 DISTNAME=	mhash-0.9.9
-PKGREVISION=	4
+PKGREVISION=	6
 CATEGORIES=	security devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mhash/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +19,17 @@ GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	include/mutils
 
+POLLUTING_SYMS=		MD4Final MD4Init MD4Transform MD4Update \
+			MD5Final MD5Init MD5Transform MD5Update
+
+SUBST_CLASSES+=		ns
+SUBST_STAGE.ns=		pre-configure
+SUBST_MESSAGE.ns=	Prefixing symbols to avoid libc namespace pollution
+SUBST_FILES.ns=		lib/*.c lib/*.h src/*.c src/*.h
+.for sym in ${POLLUTING_SYMS}
+SUBST_SED.ns+=		-e 's,\(${sym}\),mhash_\1,g'
+.endfor
+
 pre-configure:
 	cd ${WRKSRC} && autoconf -v -f
 

security/mhash/buildlink3.mk

@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2015/03/05 22:31:56 tnn Exp $
 
 BUILDLINK_TREE+=	mhash
 
 .if !defined(MHASH_BUILDLINK3_MK)
 MHASH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mhash+=	mhash>=0.8.3
-BUILDLINK_ABI_DEPENDS.mhash+=	mhash>=0.9.2nb1
+BUILDLINK_API_DEPENDS.mhash+=	mhash>=0.9.9nb6
 BUILDLINK_PKGSRCDIR.mhash?=	../../security/mhash
 .endif # MHASH_BUILDLINK3_MK