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

Cleanup this port.

Browse Source 
Make sure only the external libpopt is used, instead of a mix between
external and internal.

from Brad with some tweaks
This commit is contained in:
ajacoutot 2011-10-16 07:03:12 +00:00
parent 6b0ea09079
commit 594dc20e48
11 changed files with 291 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
misc/rpm/Makefile
View File

@ -1,21 +1,19 @@
# $OpenBSD: Makefile,v 1.24 2011/04/17 18:23:19 jasper Exp $
# $OpenBSD: Makefile,v 1.25 2011/10/16 07:03:12 ajacoutot Exp $
COMMENT = redhat package manager
COMMENT = Red Hat package manager
DISTNAME = rpm-3.0.6
REVISION = 5
REVISION = 6
SHARED_LIBS = rpm 0.1 \
rpmbuild 0.0
CATEGORIES = misc archivers emulators
# GPLv2
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
MAINTAINER = Marc Espie <espie@openbsd.org>
HOMEPAGE = http://www.rpm.org/
MASTER_SITES = ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
@ -26,19 +24,22 @@ LIB_DEPENDS += archivers/bzip2 \
devel/popt
USE_LIBTOOL = Yes
USE_GROFF = Yes
CONFIGURE_STYLE = gnu
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/popt
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.13
RPM_INTEL = RPMS/i386
SUBST_VARS = RPM_INTEL
# Enforce check for pgp, so no build-time depend is needed
CONFIGURE_ENV = PGPBIN=$(LOCALBASE)/bin/pgp
CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include
CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib -liconv"
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ENV += varprefix=/var
SEPARATE_BUILD = simple
post-install:
rm -rf ${PREFIX}/src/
rm -rf ${WRKINST}/var/lib/
.include <bsd.port.mk>

76
misc/rpm/patches/patch-Makefile_in
View File

@ -1,59 +1,43 @@
$OpenBSD: patch-Makefile_in,v 1.3 2010/05/19 13:45:15 espie Exp $
--- Makefile.in.orig Wed Sep 13 22:00:40 2000
+++ Makefile.in Wed May 19 05:28:31 2010
@@ -167,15 +167,15 @@ SUBDIRS = intl po popt lib build misc tools scripts te
INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@
$OpenBSD: patch-Makefile_in,v 1.4 2011/10/16 07:03:12 ajacoutot Exp $
--- Makefile.in.orig Wed Sep 13 16:00:40 2000
+++ Makefile.in Sun Oct 16 02:26:04 2011
@@ -162,19 +162,19 @@ EXTRA_DIST = CHANGES CREDITS GROUPS README.amiga INSTA
# XXX TODO: python perl
-SUBDIRS = intl po popt lib build misc tools scripts tests doc .
+SUBDIRS = po lib build misc tools scripts tests doc .
-INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@
+INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib @INCPATH@
-myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
+myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib -L/usr/local/lib
+myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib
# XXX libtool can/should generate dependent libs.
# XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
-myldadd = $(top_builddir)/build/.libs/librpmbuild.a $(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a @INTLLIBS@ @LIBMISC@
+myldadd = $(top_builddir)/build/.libs/librpmbuild.a @INTLLIBS@ @LIBMISC@
+myldadd = $(top_builddir)/build/.libs/librpmbuild.a $(top_builddir)/lib/.libs/librpm.a -lpopt -lintl -liconv @LIBMISC@
-LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
-LDADD = $(myldadd)
+LDFLAGS = $(myldflags)
+LDADD = $(myldadd) -L$(top_builddir)/lib/.libs -lrpm -lpopt
+LDFLAGS = @LDFLAGS@ $(myldflags)
LDADD = $(myldadd)
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
rpmbin_PROGRAMS = rpm
@@ -235,7 +235,7 @@ rpmrc.in
@@ -208,12 +208,12 @@ CPPFLAGS = @CPPFLAGS@
rpm2cpio_OBJECTS = rpm2cpio.o
rpm2cpio_LDADD = $(LDADD)
rpm2cpio_DEPENDENCIES = $(top_builddir)/build/.libs/librpmbuild.a \
-$(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a
+$(top_builddir)/lib/.libs/librpm.a
rpm2cpio_LDFLAGS =
rpm_OBJECTS = build.o rpm.o
rpm_LDADD = $(LDADD)
rpm_DEPENDENCIES = $(top_builddir)/build/.libs/librpmbuild.a \
-$(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a
+$(top_builddir)/lib/.libs/librpm.a
rpm_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS) $(pkglib_SCRIPTS)
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
SOURCES = $(rpm2cpio_SOURCES) $(rpm_SOURCES)
OBJECTS = $(rpm2cpio_OBJECTS) $(rpm_OBJECTS)
@@ -580,7 +580,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -597,17 +597,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
-build.o: build.c system.h config.h build/rpmbuild.h lib/rpmlib.h \
- lib/rpmio.h lib/dbindex.h lib/header.h popt/popt.h \
- lib/stringbuf.h lib/misc.h build/rpmspec.h lib/rpmmacro.h \
- lib/rpmurl.h build.h lib/install.h
-rpm.o: rpm.c system.h config.h build/rpmbuild.h lib/rpmlib.h lib/rpmio.h \
- lib/dbindex.h lib/header.h popt/popt.h lib/stringbuf.h \
- lib/misc.h build/rpmspec.h lib/rpmmacro.h lib/rpmurl.h build.h \
- lib/install.h lib/signature.h
-rpm2cpio.o: rpm2cpio.c system.h config.h lib/rpmlib.h lib/rpmio.h \
- lib/dbindex.h lib/header.h popt/popt.h
-
info-am:
info: info-recursive
dvi-am:

12
misc/rpm/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
--- aclocal.m4.orig Sun Sep 4 06:13:52 2011
+++ aclocal.m4 Sun Sep 4 06:14:34 2011
@@ -738,7 +738,7 @@ AC_DEFUN(AM_WITH_NLS,
[CATOBJEXT=.gmo
DATADIRNAME=share],
[CATOBJEXT=.mo
- DATADIRNAME=lib])
+ DATADIRNAME=share])
INSTOBJEXT=.mo
fi
fi

12
misc/rpm/patches/patch-build_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-build_Makefile_in,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
--- build/Makefile.in.orig Sun Sep 4 04:47:09 2011
+++ build/Makefile.in Sun Sep 4 04:48:34 2011
@@ -159,7 +159,7 @@ varprefix = @varprefix@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib @INCPATH@
pkgincdir = $(pkgincludedir)

60
misc/rpm/patches/patch-configure
View File

@ -1,60 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2000/12/06 09:45:02 espie Exp $
--- configure.orig Wed Sep 13 21:41:59 2000
+++ configure Tue Dec 5 13:55:23 2000
@@ -5675,7 +5675,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -6599,47 +6599,6 @@ if test $ac_cv_header_time = yes; then
EOF
fi
-
-
-for ac_hdr in db_185.h db1/db.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6609: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 6614 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
for ac_hdr in fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h
do

83
misc/rpm/patches/patch-configure_in Normal file
View File

@ -0,0 +1,83 @@
$OpenBSD: patch-configure_in,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
--- configure.in.orig Wed Sep 13 15:39:40 2000
+++ configure.in Sun Sep 4 06:18:45 2011
@@ -215,34 +215,6 @@ addlib() {
esac
}
-localdone=
-for dir in $prefix /usr/local
-do
- case $dir in
- NONE|/usr) continue;;
- /usr/local)
- if test X$localdone != X ; then continue; fi
- localdone="$dir"
- ;;
- esac
-
- AC_MSG_CHECKING(for $dir/lib in LIBS)
- if test -d $dir/lib ; then
- addlib $dir/lib
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- AC_MSG_CHECKING(for $dir/include in INCPATH)
- if test -d $dir/include ; then
- INCPATH="$INCPATH -I$dir/include"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-done
-
AC_MSG_CHECKING(for /usr/ucblib in LIBS)
if test -d /usr/ucblib ; then
if test "$build" = "mips-sni-sysv4" ; then
@@ -344,14 +316,10 @@ AM_FUNC_ERROR_AT_LINE
dnl ==> AM_GNU_GETTEXT does this (and more)
dnl AC_CHECK_HEADERS(unistd.h limits.h locale.h malloc.h string.h sys/param.h)
+save_LIBS="$LIBS"
+LIBS="-liconv $LIBS"
AM_GNU_GETTEXT
-dnl TVM:
-dnl horrible *temporary* hack to make sure that if we found gettext() in
-dnl -lintl that we add -lintl *back* to $LIBS.
-dnl
-if test X$gt_cv_func_gettext_libintl = Xyes ; then
- LIBS="-lintl $LIBS"
-fi
+LIBS="$save_LIBS"
dnl Checks for header files we can live without.
AC_HEADER_STDC
@@ -359,7 +327,6 @@ AC_HEADER_MAJOR
AC_HEADER_DIRENT
AC_HEADER_TIME
-AC_CHECK_HEADERS(db_185.h db1/db.h)
AC_CHECK_HEADERS(fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h)
AC_CHECK_HEADERS(sys/socket.h sys/select.h)
@@ -911,16 +878,14 @@ dnl XXX this causes popt to depend on zlib et al
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
-AC_CONFIG_SUBDIRS(popt)
AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
lib/Makefile build/Makefile tools/Makefile scripts/Makefile
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
misc/Makefile po/Makefile.in intl/Makefile
doc/Makefile doc/manual/Makefile
doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
- python/Makefile perl/Makefile perl/Makefile.PL],
- [echo timestamp > popt/stamp-h.in
- echo timestamp > stamp-h.in])
+ python/Makefile],
+ [echo timestamp > stamp-h.in])
dnl touch Makefile.in
dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])

14
misc/rpm/patches/patch-doc_rpm_8 Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-doc_rpm_8,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
Bogus mdoc macro.
--- doc/rpm.8.orig Sun Sep 4 19:30:58 2011
+++ doc/rpm.8 Sun Sep 4 19:31:07 2011
@@ -591,7 +591,6 @@ This option may also be specified by configuring the m
/var/lib/rpm/triggerindex.rpm
/tmp/rpm*
.fi
-.El
.SH SEE ALSO
.IR glint (8) ,
.IR rpm2cpio (8) ,

23
misc/rpm/patches/patch-lib_Makefile_in Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
--- lib/Makefile.in.orig Wed Sep 13 16:01:02 2000
+++ lib/Makefile.in Sun Oct 16 02:26:31 2011
@@ -159,7 +159,7 @@ varprefix = @varprefix@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@
pkgincdir = $(pkgincludedir)
pkginc_HEADERS = dbindex.h header.h misc.h rpmio.h rpmlib.h rpmmacro.h rpmurl.h stringbuf.h
@@ -167,8 +167,8 @@ pkginc_HEADERS = dbindex.h header.h misc.h rpmio.h r
noinst_HEADERS = cpio.h depends.h falloc.h fprint.h hash.h install.h lookup.h md5.h rpm_malloc.h rpmdb.h rpmlead.h signature.h
-mylibpaths = -L$(top_builddir)/lib -L$(top_builddir)/popt
-mylibs = -lrpm -lpopt @INTLLIBS@ @LIBMISC@
+mylibpaths = -L$(top_builddir)/lib @LDFLAGS@
+mylibs = -lrpm -lpopt -lintl -liconv @LIBMISC@
lib_LTLIBRARIES = librpm.la
librpm_la_SOURCES = cpio.c dbindex.c depends.c falloc.c formats.c fprint.c fs.c hash.c header.c install.c lookup.c macro.c md5.c md5sum.c messages.c misc.c package.c problems.c query.c rebuilddb.c rpmchecksig.c rpmdb.c rpmerr.c rpminstall.c rpmio.c rpmlead.c rpmlibprov.c rpmmalloc.c rpmrc.c signature.c stringbuf.c stubs.c tagName.c tagtable.c transaction.c uninstall.c url.c verify.c

98
misc/rpm/patches/patch-tools_Makefile_in Normal file
View File

@ -0,0 +1,98 @@
$OpenBSD: patch-tools_Makefile_in,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
--- tools/Makefile.in.orig Wed Sep 13 16:01:11 2000
+++ tools/Makefile.in Sun Oct 16 02:26:52 2011
@@ -159,19 +159,19 @@ varprefix = @varprefix@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@ -I$(top_srcdir)/misc
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib @INCPATH@ -I$(top_srcdir)/misc
EXTRA_DIST = fstrcmp.c message.c str-list.c rpmchecksig.c
EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject
-myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
+myldflags = -L$(top_builddir)/build -L$(top_builddir)/lib
# XXX should libtool generate dependent libs?
-myldadd = $(top_builddir)/build/librpmbuild.la $(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la @INTLLIBS@ @LIBMISC@
+myldadd = $(top_builddir)/build/librpmbuild.la $(top_builddir)/lib/librpm.la -lpopt -lintl -liconv @LIBMISC@
-LDFLAGS = $(myldflags)
+LDFLAGS = @LDFLAGS@ $(myldflags)
LDADD = $(myldadd)
noinst_PROGRAMS = dump dumpdb javadeps rpmarchive rpmheader rpmlead rpmsignature
@@ -194,60 +194,60 @@ CPPFLAGS = @CPPFLAGS@
rpmgettext_OBJECTS = rpmgettext.o
rpmgettext_LDADD = $(LDADD)
rpmgettext_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpmgettext_LDFLAGS =
rpmputtext_OBJECTS = rpmgettext.o
rpmputtext_LDADD = $(LDADD)
rpmputtext_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpmputtext_LDFLAGS =
rpminject_SOURCES = rpminject.c
rpminject_OBJECTS = rpminject.o
rpminject_LDADD = $(LDADD)
rpminject_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpminject_LDFLAGS =
dump_SOURCES = dump.c
dump_OBJECTS = dump.o
dump_LDADD = $(LDADD)
dump_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
dump_LDFLAGS =
dumpdb_SOURCES = dumpdb.c
dumpdb_OBJECTS = dumpdb.o
dumpdb_LDADD = $(LDADD)
dumpdb_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
dumpdb_LDFLAGS =
javadeps_SOURCES = javadeps.c
javadeps_OBJECTS = javadeps.o
javadeps_LDADD = $(LDADD)
javadeps_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
javadeps_LDFLAGS =
rpmarchive_SOURCES = rpmarchive.c
rpmarchive_OBJECTS = rpmarchive.o
rpmarchive_LDADD = $(LDADD)
rpmarchive_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpmarchive_LDFLAGS =
rpmheader_SOURCES = rpmheader.c
rpmheader_OBJECTS = rpmheader.o
rpmheader_LDADD = $(LDADD)
rpmheader_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpmheader_LDFLAGS =
rpmlead_SOURCES = rpmlead.c
rpmlead_OBJECTS = rpmlead.o
rpmlead_LDADD = $(LDADD)
rpmlead_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpmlead_LDFLAGS =
rpmsignature_SOURCES = rpmsignature.c
rpmsignature_OBJECTS = rpmsignature.o
rpmsignature_LDADD = $(LDADD)
rpmsignature_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
-$(top_builddir)/lib/librpm.la $(top_builddir)/popt/libpopt.la
+$(top_builddir)/lib/librpm.la
rpmsignature_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

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

@ -1,4 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.10 2006/01/14 20:27:11 steven Exp $
@comment @lib lib/libpopt.so.${LIBpopt_VERSION}
@comment $OpenBSD: PFRAG.shared,v 1.11 2011/10/16 07:03:12 ajacoutot Exp $
@lib lib/librpm.so.${LIBrpm_VERSION}
@lib lib/librpmbuild.so.${LIBrpmbuild_VERSION}

36
misc/rpm/pkg/PLIST
View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2006/01/14 20:27:11 steven Exp $
@comment $OpenBSD: PLIST,v 1.7 2011/10/16 07:03:12 ajacoutot Exp $
@conflict rpm2cpio-*
%%SHARED%%
bin/gendiff
bin/rpm
bin/rpm2cpio
@comment include/popt.h
@bin bin/rpm
@bin bin/rpm2cpio
include/rpm/
include/rpm/dbindex.h
include/rpm/header.h
@ -15,19 +15,10 @@ include/rpm/rpmmacro.h
include/rpm/rpmspec.h
include/rpm/rpmurl.h
include/rpm/stringbuf.h
@comment lib/libpopt.a
@comment lib/libpopt.la
lib/librpm.a
lib/librpm.la
lib/librpmbuild.a
lib/librpmbuild.la
@comment lib/locale/
@comment lib/locale/ro/
@comment lib/locale/ro/LC_MESSAGES/
@comment lib/locale/ro/LC_MESSAGES/popt.mo
@comment lib/locale/sk/
@comment lib/locale/sk/LC_MESSAGES/
@comment lib/locale/sk/LC_MESSAGES/popt.mo
lib/rpm/
lib/rpm/brp-compress
lib/rpm/brp-redhat
@ -57,9 +48,9 @@ lib/rpm/perl.prov
lib/rpm/perl.req
lib/rpm/rpmdiff
lib/rpm/rpmdiff.cgi
lib/rpm/rpmgettext
@bin lib/rpm/rpmgettext
lib/rpm/rpmpopt
lib/rpm/rpmputtext
@bin lib/rpm/rpmputtext
lib/rpm/rpmrc
lib/rpm/u_pkg.sh
lib/rpm/vpkg-provides.sh
@ -71,7 +62,6 @@ lib/rpmrc
@comment @man man/ja/man8/rpm.8
@comment @man man/ja/man8/rpm2cpio.8
@man man/man1/gendiff.1
@comment @man man/man3/popt.3
@man man/man8/rpm.8
@man man/man8/rpm2cpio.8
@comment man/pl/
@ -97,17 +87,3 @@ share/locale/sl/LC_MESSAGES/rpm.mo
share/locale/sr/LC_MESSAGES/rpm.mo
share/locale/sv/LC_MESSAGES/rpm.mo
share/locale/tr/LC_MESSAGES/rpm.mo
src/
src/redhat/
src/redhat/BUILD/
src/redhat/RPMS/
@comment src/redhat/RPMS/athlon/
src/redhat/${RPM_INTEL}/
@comment src/redhat/RPMS/i486/
@comment src/redhat/RPMS/i586/
@comment src/redhat/RPMS/i686/
src/redhat/RPMS/noarch/
src/redhat/SOURCES/
src/redhat/SPECS/
src/redhat/SRPMS/
%%SHARED%%