Remove hardcoded "-ldb" from makedefs, because pkgsrc provides a

correct option.

This fixes PR pkg/25176.

4 files changed, 29 insertions, 13 deletions

diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 0346a259bfd..9d24d62f67a 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/04/12 16:04:45 taca Exp $
+$NetBSD: distinfo,v 1.3 2004/04/14 12:55:20 minskim Exp $
 
 SHA1 (postfix/postfix-2.0.19-20040312.tar.gz) = 68ade8c704c3c54ad6465d695ff9b8f0230e8758
 Size (postfix/postfix-2.0.19-20040312.tar.gz) = 1531471 bytes
@@ -11,6 +11,6 @@ SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
 SHA1 (patch-ae) = 9ea314db37541a1a9c7765e000687c0fdef90d8e
 SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-SHA1 (patch-ai) = 25af047b95fcdd9bf71ac853a291b2499230ad42
+SHA1 (patch-ai) = 9afae33799d16fb44480580023df990036364592
 SHA1 (patch-bd) = 652b96357164208e39d322e84ee9a2ad2bd4ccc4
 SHA1 (patch-be) = dd00235af79a8d5e46a7d393e18840241bb685a8
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 6ed6681fbfc..88ea60d8810 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2004/03/06 15:08:32 grant Exp $
+$NetBSD: patch-ai,v 1.4 2004/04/14 12:55:20 minskim Exp $
 
---- makedefs.orig	2003-11-05 21:50:15.000000000 +0200
-+++ makedefs	2004-01-23 13:56:57.000000000 +0200
-@@ -175,22 +175,6 @@
+--- makedefs.orig	2004-01-16 18:27:11.000000000 -0600
++++ makedefs
+@@ -178,22 +178,6 @@ case "$SYSTEM.$RELEASE" in
  		SYSLIBS="-ldb"
  		;;
      Linux.2*)	SYSTYPE=LINUX2
@@ -25,3 +25,11 @@ $NetBSD: patch-ai,v 1.3 2004/03/06 15:08:32 grant Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
+@@ -204,7 +188,6 @@ case "$SYSTEM.$RELEASE" in
+ 		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
+ 		#     GDBM_LIBS=gdbm
+ 		# fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv $GDBM_LIBS
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index e1922aeb4a2..3860bc707a0 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2004/04/11 02:23:46 kim Exp $
+$NetBSD: distinfo,v 1.61 2004/04/14 12:55:20 minskim Exp $
 
 SHA1 (postfix/postfix-2.0.19.tar.gz) = 5248f4d0af530260b6715da3a973557ae63df382
 Size (postfix/postfix-2.0.19.tar.gz) = 1355184 bytes
@@ -13,7 +13,7 @@ SHA1 (patch-ad) = 60d98330d4b20508c03bb0bccebbe564ffea621f
 SHA1 (patch-ae) = 2a118fb905c469f8a2e947c3e91b5d4e82c5bb6e
 SHA1 (patch-af) = 9b0521751704fd1377d8215dc16a873c1d5ca032
 SHA1 (patch-ah) = 6beedd15ee3a7cfd46cf3ed0b9ee579b9906300b
-SHA1 (patch-ai) = aa146d4e4e2b231971e239257cd209f21f53e19c
+SHA1 (patch-ai) = 475737812dd2025ae52ba9eab7569119d251eed6
 SHA1 (patch-ba) = e0ed2e41db1cfaf5d924578e536d809ff8623e2d
 SHA1 (patch-bb) = ba4cf4020ee26c3e43bd816f549ad6557a484110
 SHA1 (patch-bc) = 07ee685f6c607a5ee7ea723c4a36729a9c662ba1
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index e378ad87941..6bd03255b57 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.9 2004/04/11 02:23:46 kim Exp $
+$NetBSD: patch-ai,v 1.10 2004/04/14 12:55:20 minskim Exp $
 
---- makedefs.orig	2003-11-05 14:50:15.000000000 -0500
-+++ makedefs	2004-04-10 22:21:52.000000000 -0400
-@@ -94,7 +94,7 @@
+--- makedefs.orig	2003-11-05 13:50:15.000000000 -0600
++++ makedefs
+@@ -94,7 +94,7 @@ case "$SYSTEM.$RELEASE" in
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
  		;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.9 2004/04/11 02:23:46 kim Exp $
  		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
-@@ -175,22 +175,6 @@
+@@ -175,22 +175,6 @@ case "$SYSTEM.$RELEASE" in
  		SYSLIBS="-ldb"
  		;;
      Linux.2*)	SYSTYPE=LINUX2
@@ -34,3 +34,11 @@ $NetBSD: patch-ai,v 1.9 2004/04/11 02:23:46 kim Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
+@@ -201,7 +185,6 @@ case "$SYSTEM.$RELEASE" in
+ 		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
+ 		#     GDBM_LIBS=gdbm
+ 		# fi
+-		SYSLIBS="-ldb"
+ 		for name in nsl resolv $GDBM_LIBS
+ 		do
+ 		    for lib in /usr/lib64 /lib64 /usr/lib /lib