pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/rpm Replace rename with l to work with both old a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/012a0503cef7
branches:  trunk
changeset: 643137:012a0503cef7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Dec 11 22:13:08 2014 +0000

description:
Replace rename with l to work with both old and new wrappers.

diffstat:

 misc/rpm/Makefile |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r ace0a69f71e1 -r 012a0503cef7 misc/rpm/Makefile
--- a/misc/rpm/Makefile Thu Dec 11 22:12:33 2014 +0000
+++ b/misc/rpm/Makefile Thu Dec 11 22:13:08 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2014/08/08 15:00:54 dholland Exp $
+# $NetBSD: Makefile,v 1.84 2014/12/11 22:13:08 joerg Exp $
 
 DISTNAME=      rpm-4.11.1
 PKGREVISION=   2
@@ -37,12 +37,15 @@
 CONFIGURE_ARGS+=       --with-external-db
 
 BDB_ACCEPTED=          db4 db5
-
+.include "../../mk/bdb.buildlink3.mk"
+.if ${BDB_TYPE} == "db4"
+BUILDLINK_TRANSFORM+=  l:db:db4
+.else
+BUILDLINK_TRANSFORM+=  l:db:db5
+.endif
 # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
 CONFIGURE_ENV+=                varprefix=${RPM_DB_PREFIX:Q}
 
-# Needs help finding bdb.
-BUILDLINK_TRANSFORM+=  rename:-ldb:${BDB_LIBS}
 LDFLAGS+=              ${PTHREAD_LDFLAGS}
 
 MAKE_FLAGS+=           MANDIR=${PREFIX}/${PKGMANDIR}/man8
@@ -82,5 +85,4 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk" # for libmagic.
 
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index