Fix patch-ad not applying cleanly, and support for Solaris which needs -lresolv

This commit is contained in:
Filip Hajny 2009-09-30 10:31:58 +00:00 committed by Thomas Klausner
parent a90dafc0af
commit 0a04bea8cc
3 changed files with 11 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2009/05/19 09:00:06 thomasklausner Exp $
# $NetBSD: Makefile,v 1.18 2009/09/30 10:31:58 fhajny Exp $
DISTNAME= dk-milter-1.0.2
#PKGREVISION= 1
@ -16,6 +16,8 @@ USE_BUILTIN.libmilter= no
USE_TOOLS+= gm4
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
SUBST_CLASSES+= libs
SUBST_STAGE.libs= post-patch
SUBST_FILES.libs= site.config.m4.dist dk-filter/Makefile.m4 \
@ -24,6 +26,9 @@ SUBST_SED.libs= -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
SUBST_SED.libs+= -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g'
SUBST_SED.libs+= -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g'
SUBST_SED.libs+= -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS:Q} ${PTHREAD_LIBS:Q}|g'
.if ${OPSYS} == SunOS
SUBST_SED.libs+= -e 's|-lrt|-lrt -lresolv|g'
.endif
SUBST_MESSAGE.libs= Fixing makefile references.
# Rename dk-filter to dk-milter.

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.9 2009/04/13 18:59:48 jukka Exp $
$NetBSD: distinfo,v 1.10 2009/09/30 10:31:58 fhajny Exp $
SHA1 (dk-milter-1.0.2.tar.gz) = 95b60ebb9d28c8213ce36c3fcf383faeaa3f0e6a
RMD160 (dk-milter-1.0.2.tar.gz) = 24c1b3f023257937f212e38e15b151b9a5e81caf
@ -6,5 +6,5 @@ Size (dk-milter-1.0.2.tar.gz) = 362255 bytes
SHA1 (patch-aa) = b5d55642518f6ee4653ce97e7aa46b99043280b3
SHA1 (patch-ab) = 43ecaeda136b9267a4a2164e7125946d47e3685b
SHA1 (patch-ac) = 4a65218ffa02f998a6e697f622ea765446cb43cb
SHA1 (patch-ad) = 4c47aeb2dc12851703ffdc8a0e7239fd5f673af2
SHA1 (patch-ad) = 790602661bc34767c22e80a1e12e23ddf323c291
SHA1 (patch-ae) = c8d6294625d698e8eea0e23a3b9fcbe448dabcae

View file

@ -1,7 +1,8 @@
$NetBSD: patch-ad,v 1.1 2008/12/01 00:16:21 pettai Exp $
$NetBSD: patch-ad,v 1.2 2009/09/30 10:31:58 fhajny Exp $
--- devtools/OS/NetBSD.orig Sun Jun 27 00:19:35 2004
+++ devtools/OS/NetBSD Sun Jun 27 00:24:11 2004
@@ -7,13 +7,14 @@
@@ -6,14 +6,16 @@
define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
define(`confLIBS', `-lutil')
define(`confENVDEF', ` -DNETISO')
+define(`confSM_OS_HEADER', `sm_os_netbsd')