cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid conflict with popt by using the installed library.

Browse Source 
(note we still build the included library, as the changes not to do so
are a bit invasive).
This commit is contained in:
espie 2000-10-22 19:33:27 +00:00
parent a53155856c
commit b57f0aa0ef
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/rpm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2000/10/10 00:40:52 espie Exp $
# $OpenBSD: Makefile,v 1.4 2000/10/22 19:33:27 espie Exp $
DISTNAME= rpm-3.0.4
CATEGORIES= misc archivers emulators
@ -18,6 +18,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
LIB_DEPENDS= bz2.::archivers/bzip2
RUN_DEPENDS= gettext::devel/gettext
LIB_DEPENDS+= intl.::devel/gettext
LIB_DEPENDS+= popt.0.::devel/popt
CONFIGURE_STYLE= gnu

3
misc/rpm/pkg/PFRAG.shared
View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 00:24:53 krw Exp $
lib/libpopt.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/10/22 19:33:27 espie Exp $
lib/librpm.so.0.0
DYNLIBDIR(%D/lib)

8
misc/rpm/pkg/PLIST
View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2000/06/12 18:49:41 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2000/10/22 19:33:27 espie Exp $
@pkgcfl rpm2cpio-*
bin/gendiff
bin/rpm
bin/rpm2cpio
include/popt.h
include/rpm/dbindex.h
include/rpm/header.h
include/rpm/misc.h
@ -14,8 +13,6 @@ include/rpm/rpmmacro.h
include/rpm/rpmspec.h
include/rpm/rpmurl.h
include/rpm/stringbuf.h
lib/libpopt.a
lib/libpopt.la
lib/librpm.a
lib/librpm.la
lib/librpmbuild.a
@ -59,7 +56,6 @@ lib/rpm/vpkg-provides2.sh
lib/rpmpopt
lib/rpmrc
man/man1/gendiff.1
man/man3/popt.3
man/man8/rpm.8
man/man8/rpm2cpio.8
share/locale/cs/LC_MESSAGES/rpm.mo
@ -69,9 +65,7 @@ share/locale/fr/LC_MESSAGES/rpm.mo
share/locale/ja/LC_MESSAGES/rpm.mo
share/locale/pl/LC_MESSAGES/rpm.mo
share/locale/pt_BR/LC_MESSAGES/rpm.mo
share/locale/ro/LC_MESSAGES/popt.mo
share/locale/ru/LC_MESSAGES/rpm.mo
share/locale/sk/LC_MESSAGES/popt.mo
share/locale/sk/LC_MESSAGES/rpm.mo
share/locale/sl/LC_MESSAGES/rpm.mo
share/locale/sr/LC_MESSAGES/rpm.mo