[pkgsrc/trunk]: pkgsrc/misc/rpm Revert previous, it breaks NetBSD. Will have...

[sketch <sketch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9f93aa79b59
branches:  trunk
changeset: 565403:a9f93aa79b59
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Tue Sep 22 13:16:00 2009 +0000

description:
Revert previous, it breaks NetBSD.  Will have to stay broken on Solaris for
a little longer.

diffstat:

 misc/rpm/Makefile |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (29 lines):

diff -r e210b9941a1a -r a9f93aa79b59 misc/rpm/Makefile
--- a/misc/rpm/Makefile Tue Sep 22 13:11:06 2009 +0000
+++ b/misc/rpm/Makefile Tue Sep 22 13:16:00 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/09/22 08:37:15 sketch Exp $
+# $NetBSD: Makefile,v 1.68 2009/09/22 13:16:00 sketch Exp $
 
 DISTNAME=      rpm-2.5.4
 PKGREVISION=   6
@@ -33,13 +33,6 @@
 RPMDIR=                        ${RPM_DB_PREFIX}/lib/rpm
 FILES_SUBST+=          RPMDIR=${RPMDIR:Q}
 
-.include "../../mk/bdb.buildlink3.mk"
-
-# Ugly hack, but easier than fixing our bdb handling / rpm configure for now
-.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
-LDFLAGS+=              -ldb
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
 post-configure:
@@ -62,4 +55,5 @@
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"