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

update to 3.0.6 (from kevlo@), and fix quite a few details I should

Browse Source 
have fixed when I imported this port:
don't build rpm using -static, as we don't intend to use rpm to install
a new system (the configuration system of this port is stupid).
one thing leading to another: fix the usual libtool bug, fix the usual
gettext bug... fed up of GNU.
This commit is contained in:
espie 2000-12-06 09:45:02 +00:00
parent 1888076638
commit c93406f23e
8 changed files with 147 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/rpm/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.4 2000/10/22 19:33:27 espie Exp $
# $OpenBSD: Makefile,v 1.5 2000/12/06 09:45:02 espie Exp $
DISTNAME= rpm-3.0.4
DISTNAME= rpm-3.0.6
CATEGORIES= misc archivers emulators
NEED_VERSION= 1.310
@ -24,7 +24,12 @@ CONFIGURE_STYLE= gnu
# 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
CONFIGURE_ENV+= varprefix=/var
MAKE_FLAGS=librpm_la_LDFLAGS='-version-info 0:1:0'
SEPARATE_BUILD= simple
.include <bsd.port.mk>

6
misc/rpm/files/md5
View File

@ -1,3 +1,3 @@
MD5 (rpm-3.0.4.tar.gz) = 09799fc36ab61251275dafd912994198
RMD160 (rpm-3.0.4.tar.gz) = 6250bb68b8194119356fa85f7d06e3b56d2b5a57
SHA1 (rpm-3.0.4.tar.gz) = 4ee4c9fb5e3eb5ef78d4383f322204ea85063b59
MD5 (rpm-3.0.6.tar.gz) = 71961a796fbb04d2cf22a37337b63da8
RMD160 (rpm-3.0.6.tar.gz) = 5fe8553b9ea37bc12bea2b744e48eb2a6a351822
SHA1 (rpm-3.0.6.tar.gz) = 15bd17c77b25290d5b11c066c0ee1a19e288fd78

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

@ -1,12 +1,59 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2000/06/12 18:49:41 espie Exp $
--- Makefile.in.orig Mon Jun 12 20:38:16 2000
+++ Makefile.in Mon Jun 12 20:38:34 2000
@@ -754,7 +754,7 @@ lclint:
lclint ${DEFS} ${INCLUDES} ${rpm_SOURCES}
$OpenBSD: patch-Makefile_in,v 1.2 2000/12/06 09:45:02 espie Exp $
--- Makefile.in.orig Wed Sep 13 22:00:40 2000
+++ Makefile.in Tue Dec 5 13:22:12 2000
@@ -167,15 +167,15 @@ SUBDIRS = intl po popt lib build misc to
INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@
install-data-local:
- @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
+ @$(mkinstalldirs) $(DESTDIR)$(varprefix)/db/rpm
@rm -f $(DESTDIR)/$(libdir)/rpmrc
@ln -s rpm/rpmrc $(DESTDIR)/$(libdir)/rpmrc
@rm -f $(DESTDIR)/$(libdir)/rpmpopt
-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
# 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@
-LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
-LDADD = $(myldadd)
+LDFLAGS = $(myldflags)
+LDADD = $(myldadd) -L$(top_builddir)/lib/.libs -lrpm -lpopt
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
rpmbin_PROGRAMS = rpm
@@ -235,7 +235,7 @@ rpmrc.in
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:

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

@ -0,0 +1,60 @@
$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

11
misc/rpm/patches/patch-ltconfig Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-ltconfig,v 1.1 2000/12/06 09:45:02 espie Exp $
--- ltconfig.orig Tue Dec 5 05:43:21 2000
+++ ltconfig Tue Dec 5 05:44:11 2000
@@ -2028,6 +2028,7 @@ openbsd*)
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method=pass_all
;;
os2*)

9
misc/rpm/patches/patch-macros_in
View File

@ -1,12 +1,11 @@
$OpenBSD: patch-macros_in,v 1.1.1.1 2000/06/12 18:49:41 espie Exp $
--- macros.in.orig Mon Jun 12 20:22:36 2000
+++ macros.in Mon Jun 12 20:22:50 2000
@@ -80,7 +80,7 @@
--- macros.in.orig Mon Dec 4 15:27:59 2000
+++ macros.in Mon Dec 4 15:28:33 2000
@@ -86,7 +86,7 @@
%_builddir %{_topdir}/BUILD
%_buildshell /bin/sh
%_bzip2bin @BZIP2BIN@
-%_dbpath %{_var}/lib/rpm
+%_dbpath %{_var}/db/rpm
%_rebuilddbpath %{_dbpath}
%_dbpath_rebuild %{_dbpath}
%_defaultdocdir %{_usr}/doc
#

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

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/10/22 19:33:27 espie Exp $
lib/librpm.so.0.0
@comment $OpenBSD: PFRAG.shared,v 1.4 2000/12/06 09:45:03 espie Exp $
lib/librpm.so.0.1
DYNLIBDIR(%D/lib)

4
misc/rpm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2000/10/22 19:33:27 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2000/12/06 09:45:03 espie Exp $
@pkgcfl rpm2cpio-*
bin/gendiff
bin/rpm
@ -20,6 +20,7 @@ lib/librpmbuild.la
%%SHARED%%
lib/rpm/brp-compress
lib/rpm/brp-redhat
lib/rpm/brp-sparc64-linux
lib/rpm/brp-strip
lib/rpm/brp-strip-comment-note
lib/rpm/check-prereqs
@ -34,7 +35,6 @@ lib/rpm/find-provides.perl
lib/rpm/find-req.pl
lib/rpm/find-requires
lib/rpm/find-requires.perl
lib/rpm/freshen.sh
lib/rpm/get_magic.pl
lib/rpm/getpo.sh
lib/rpm/http.req