Tue Sep 22 13:16:00 2009 UTC ()
Revert previous, it breaks NetBSD.  Will have to stay broken on Solaris for
a little longer.


(sketch)
diff -r1.67 -r1.68 pkgsrc/misc/rpm/Makefile
cvs diff -r1.67 -r1.68 pkgsrc/misc/rpm/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/rpm/Makefile 2009/09/22 08:37:15 1.67
+++ pkgsrc/misc/rpm/Makefile 2009/09/22 13:16:00 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.67 2009/09/22 08:37:15 sketch Exp $ 1# $NetBSD: Makefile,v 1.68 2009/09/22 13:16:00 sketch Exp $
2 2
3DISTNAME= rpm-2.5.4 3DISTNAME= rpm-2.5.4
4PKGREVISION= 6 4PKGREVISION= 6
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ 6MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.rpm.org/ 9HOMEPAGE= http://www.rpm.org/
10COMMENT= The Red Hat Package Manager 10COMMENT= The Red Hat Package Manager
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14CONFLICTS+= rpm2cpio<1.0nb1 14CONFLICTS+= rpm2cpio<1.0nb1
@@ -23,43 +23,37 @@ GNU_CONFIGURE= yes @@ -23,43 +23,37 @@ GNU_CONFIGURE= yes
23 23
24# this is needed in addition of USE_PKGLOCALEDIR 24# this is needed in addition of USE_PKGLOCALEDIR
25CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} 25CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR}
26 26
27# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. 27# The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm.
28CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} 28CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q}
29 29
30MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8 30MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8
31MAKE_FLAGS+= ROOT=${DESTDIR} 31MAKE_FLAGS+= ROOT=${DESTDIR}
32 32
33RPMDIR= ${RPM_DB_PREFIX}/lib/rpm 33RPMDIR= ${RPM_DB_PREFIX}/lib/rpm
34FILES_SUBST+= RPMDIR=${RPMDIR:Q} 34FILES_SUBST+= RPMDIR=${RPMDIR:Q}
35 35
36.include "../../mk/bdb.buildlink3.mk" 
37 
38# Ugly hack, but easier than fixing our bdb handling / rpm configure for now 
39.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) 
40LDFLAGS+= -ldb 
41.endif 
42 
43.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
44 37
45post-configure: 38post-configure:
46 cd ${WRKSRC}/po && ${MV} cz.po cs.po 39 cd ${WRKSRC}/po && ${MV} cz.po cs.po
47 40
48pre-install: 41pre-install:
49 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/rpm 42 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/rpm
50 43
51.if defined(RANLIB) 44.if defined(RANLIB)
52post-install: 45post-install:
53 $(RANLIB) ${DESTDIR}${PREFIX}/lib/librpm.a 46 $(RANLIB) ${DESTDIR}${PREFIX}/lib/librpm.a
54.endif 47.endif
55 48
56# The configure script doesn't detect whether libintl.so has any 49# The configure script doesn't detect whether libintl.so has any
57# library dependencies. 50# library dependencies.
58# 51#
59BROKEN_GETTEXT_DETECTION= yes 52BROKEN_GETTEXT_DETECTION= yes
60 53
61.include "../../devel/gettext-lib/buildlink3.mk" 54.include "../../devel/gettext-lib/buildlink3.mk"
62.include "../../devel/popt/buildlink3.mk" 55.include "../../devel/popt/buildlink3.mk"
63.include "../../devel/zlib/buildlink3.mk" 56.include "../../devel/zlib/buildlink3.mk"
64 57
 58.include "../../mk/bdb.buildlink3.mk"
65.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"