summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormycroft <mycroft@pkgsrc.org>1998-07-10 05:25:45 +0000
committermycroft <mycroft@pkgsrc.org>1998-07-10 05:25:45 +0000
commit4d24061148ec6da905ee1fecd28335a22310aa27 (patch)
treec043c2ecc8d6ff8c49f9f51ffc080d07d030961b /misc
parentdd9de7a51b6f5ff55836474b38478b8d022d5d4b (diff)
downloadpkgsrc-4d24061148ec6da905ee1fecd28335a22310aa27.tar.gz
Update to 2.5.1, with a horrible hack around the INSTALL_PROGRAM problem.
Diffstat (limited to 'misc')
-rw-r--r--misc/rpm/Makefile9
-rw-r--r--misc/rpm/files/md52
-rw-r--r--misc/rpm/patches/patch-ab12
-rw-r--r--misc/rpm/patches/patch-ae18
-rw-r--r--misc/rpm/patches/patch-af219
-rw-r--r--misc/rpm/patches/patch-ag11
-rw-r--r--misc/rpm/patches/patch-ah11
7 files changed, 236 insertions, 46 deletions
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 155e0e75c51..a3eb2888e41 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.12 1998/06/22 12:52:34 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/07/10 05:25:45 mycroft Exp $
#
-DISTNAME= rpm-2.4.12
+DISTNAME= rpm-2.5.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/code/rpm/ \
ftp://ftp.gwdg.de/pub/linux/redhat/code/rpm/
MAINTAINER= mycroft@NetBSD.ORG
-BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:../../databases/gdbm
+CONFLICTS= rpm-2.4.12
+
+DEPENDS= gdbm-1.7.3:../../databases/gdbm
GNU_CONFIGURE= yes
-USE_GMAKE= yes
pre-install:
${MKDIR} ${PREFIX}/include/rpm
diff --git a/misc/rpm/files/md5 b/misc/rpm/files/md5
index 589ce6bdc8a..15d8cf55708 100644
--- a/misc/rpm/files/md5
+++ b/misc/rpm/files/md5
@@ -1 +1 @@
-MD5 (rpm-2.4.12.tar.gz) = 09ca43a161ee45b01128c2f33302090e
+MD5 (rpm-2.5.1.tar.gz) = 7ad09e9b98bc839a0646c62dd130186e
diff --git a/misc/rpm/patches/patch-ab b/misc/rpm/patches/patch-ab
deleted file mode 100644
index 11a199ba9e3..00000000000
--- a/misc/rpm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- po/Makefile.in 1997/10/13 14:37:47 1.1
-+++ po/Makefile.in 1997/10/13 14:39:08
-@@ -58,8 +58,7 @@
- install:
- for n in $(CATALOGS); do \
- l=`basename $$n .mo`; \
-- $(INSTALL) -m 755 -d $(installprefix)/$(RPMNLSDIR)/$$l; \
-- $(INSTALL) -m 755 -d $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES; \
-+ mkdir -p $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES; \
- $(INSTALL) -m 644 $$n $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES/rpm.mo; \
- done
-
diff --git a/misc/rpm/patches/patch-ae b/misc/rpm/patches/patch-ae
index b02d6f81034..937516b88c8 100644
--- a/misc/rpm/patches/patch-ae
+++ b/misc/rpm/patches/patch-ae
@@ -1,18 +1,10 @@
---- Makefile.inc.in.orig Wed May 28 16:19:44 1997
-+++ Makefile.inc.in Wed Jul 2 14:09:57 1997
-@@ -3,12 +3,13 @@
+--- Makefile.inc.in.orig Wed May 27 10:49:34 1998
++++ Makefile.inc.in Sat Jul 4 06:07:15 1998
+@@ -4,6 +4,7 @@
prefix= @prefix@
exec_prefix = @exec_prefix@
- libdir= $(prefix)/lib
-+datadir= $(prefix)/share
+ libdir= @libdir@
++datadir= @datadir@
AR = ar
RANLIB = @RANLIB@
- OPTS = @DEFS@
--LIBRPMRC_FILENAME=$(libdir)/rpmrc
--LIBRPMALIAS_FILENAME=$(libdir)/rpmpopt
-+LIBRPMRC_FILENAME=$(datadir)/misc/rpmrc
-+LIBRPMALIAS_FILENAME=$(datadir)/misc/rpmpopt
- RPMNLSDIR=@datadir@/locale
- RPMNLSPACKAGE=rpm
- CFLAGS = @CFLAGS@ @INCPATH@ $(WARNINGS) $(OPTS) -I$(topdir) \
diff --git a/misc/rpm/patches/patch-af b/misc/rpm/patches/patch-af
index 63339da7dff..8e7a6a1881e 100644
--- a/misc/rpm/patches/patch-af
+++ b/misc/rpm/patches/patch-af
@@ -1,6 +1,6 @@
---- Makefile.in.orig Fri Oct 31 20:37:13 1997
-+++ Makefile.in Thu Nov 20 13:16:39 1997
-@@ -25,6 +25,7 @@
+--- Makefile.in.orig Wed May 27 10:49:34 1998
++++ Makefile.in Fri Jul 10 01:03:44 1998
+@@ -24,6 +24,7 @@
RPMBINDIR=$(subst usr/bin,bin,$(BINDIR))
MANDIR=$(prefix)/man/man8
LIBDIR=$(libdir)
@@ -8,23 +8,210 @@
INCDIR=$(prefix)/include/rpm
ETCDIR=$(ROOT)/etc
-@@ -49,7 +50,7 @@
+@@ -42,16 +43,16 @@
+
+ SOURCES = $(subst .o,.c,$(OBJS))
+
+-ifeq (.depend-done,$(wildcard .depend-done))
++.if exists(.depend-done)
+ TARGET=everything
+-else
++.else
+ TARGET=@TARGET@
+-endif
++.endif
+
all: $(TARGET)
- rpm: lib/librpm.a build/libbuild.a @MISCPATH@ $(OBJS)
-- $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
-+ $(CC) -o rpm $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
+ rpm: lib/librpm.a build/librpmbuild.a @MISCPATH@ $(OBJS)
+- $(CC) -o rpm $(LDFLAGS_STATIC) $(OBJS) $(LDFLAGS) $(LOADLIBES) $(LIBS) \
++ $(CC) -o rpm $(OBJS) $(LDFLAGS) $(LOADLIBES) $(LIBS) \
$(LIBEFENCE)
- rpm.shared: lib/librpm.a build/libbuild.a $(OBJS)
-@@ -121,8 +122,8 @@
- $(INSTALL) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR)
- $(INSTALL) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
- $(INSTALL) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
-- $(INSTALL) -m 644 $(srcdir)/lib-rpmrc $(installprefix)/$(LIBDIR)/rpmrc
-- $(INSTALL) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt
-+ $(INSTALL) -m 644 $(srcdir)/lib-rpmrc $(installprefix)/$(DATADIR)/misc/rpmrc
-+ $(INSTALL) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(DATADIR)/misc/rpmpopt
+ rpm.shared: lib/librpm.a build/librpmbuild.a $(OBJS)
+@@ -115,20 +116,20 @@
+ [ -d $(installprefix)/$(LIBDIR) ] || mkdir -p $(installprefix)/$(LIBDIR)
+ [ -d $(installprefix)/$(INCDIR) ] || mkdir -p $(installprefix)/$(INCDIR)
+ [ -d $(installprefix)/$(RPMCONFIGDIR) ] || \
+- mkdir -p $(installprefix)/$(INCDIR)
++ mkdir -p $(installprefix)/$(RPMCONFIGDIR)
+ if [ -x ./rpm ]; then \
+ $(INSTALL_PROGRAM) -s -m 755 rpm $(installprefix)/$(RPMBINDIR); \
+ else \
+ $(INSTALL_PROGRAM) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
+ fi
+- $(INSTALL_PROGRAM) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
+- $(INSTALL_PROGRAM) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(BINDIR)/find-provides
+- $(INSTALL_PROGRAM) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(BINDIR)/find-requires
++ $(INSTALL_PROGRAM:N-s) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
++ $(INSTALL_PROGRAM:N-s) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(BINDIR)/find-provides
++ $(INSTALL_PROGRAM:N-s) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(BINDIR)/find-requires
+ $(INSTALL_PROGRAM) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR)
+ $(INSTALL_DATA) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
+ $(INSTALL_DATA) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
+- $(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(LIBDIR)/rpmrc
+- $(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt
++ $(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
++ $(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
(cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
for d in $(INSTSUBDIRS); do \
(cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\
+@@ -205,6 +206,6 @@
+ @echo " "
+ @echo "The final archive is ./rpm-$(VERSION).tar.gz."
+
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++.if exists(.depend)
++.include ".depend"
++.endif
+--- build/Makefile.in.orig Wed May 27 10:49:37 1998
++++ build/Makefile.in Fri Jul 10 01:03:44 1998
+@@ -15,7 +15,7 @@
+
+ # -----------------------------------------------------------------------
+
+-include ../Makefile.inc
++.include "../Makefile.inc"
+
+ TARGET=everything
+
+@@ -44,6 +44,6 @@
+ $(CPP) $(CFLAGS) -MM $(srcdir)/*.c | \
+ sed s+$$topdir_path+$(top_srcdir)+g > .depend
+
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++.if exists(.depend)
++.include ".depend"
++.endif
+--- lib/Makefile.in.orig Wed May 27 10:49:38 1998
++++ lib/Makefile.in Fri Jul 10 01:09:10 1998
+@@ -23,7 +23,7 @@
+
+ # -----------------------------------------------------------------------
+
+-include ../Makefile.inc
++.include "../Makefile.inc"
+
+ TARGET=allprogs
+
+@@ -41,7 +41,8 @@
+
+ $(PROGS): $(LIBRPM)
+
+-$(LIBRPM): $(LIBRPM)($(LIBOBJECTS) $(TAGTABLE))
++$(LIBRPM): $(LIBOBJECTS) $(TAGTABLE)
++ $(AR) r $@ $(LIBOBJECTS) $(TAGTABLE)
+ $(RANLIB) $@
+
+ tagtable.c: rpmlib.h
+@@ -74,6 +75,6 @@
+ $(CPP) $(CFLAGS) -MM $(SOURCES) | \
+ sed s+$$topdir_path+$(top_srcdir)+g > .depend
+
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++.if exists(.depend)
++.include ".depend"
++.endif
+--- misc/Makefile.in.orig Wed May 27 10:49:41 1998
++++ misc/Makefile.in Fri Jul 10 01:09:52 1998
+@@ -2,7 +2,7 @@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+
+-include ../Makefile.inc
++.include "../Makefile.inc"
+
+ LIBOBJECTS = @MISCOBJS@
+ LIBMISC = libmisc.a
+@@ -32,6 +32,6 @@
+ $(CPP) $(CFLAGS) -MM $(srcdir)/*.c | \
+ sed s+$$topdir_path+$(top_srcdir)+g > .depend
+
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++.if exists(.depend)
++.include ".depend"
++.endif
+--- po/Makefile.in.orig Wed May 27 10:49:42 1998
++++ po/Makefile.in Fri Jul 10 01:09:59 1998
+@@ -1,7 +1,7 @@
+ srcdir = @srcdir@
+ VPATH = $(srcdir)
+
+-include ../Makefile.inc
++.include "../Makefile.inc"
+
+ INSTALL= @INSTALL@
+ INSTALL_PROGRAM= @INSTALL_PROGRAM@
+@@ -67,5 +67,6 @@
+ $(INSTALL) -m 644 $$n $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES/rpm.mo; \
+ done
+
+-%.mo: %.po
++.SUFFIXES: po mo
++.po.mo:
+ msgfmt -o $@ $<
+--- popt/Makefile.in.orig Wed May 27 10:49:44 1998
++++ popt/Makefile.in Fri Jul 10 01:09:33 1998
+@@ -24,17 +24,16 @@
+
+ CFLAGS = @CFLAGS@ @DEFS@ $(OPTS)
+
+-ifeq ($(RANLIB),)
+-RANLIB=ranlib
+-endif
++RANLIB ?= ranlib
+
+-ifeq (.depend-done,$(wildcard .depend-done))
++.if exists(.depend-done)
+ TARGET=allprogs
+-else
++.else
+ TARGET=@TARGET@
+-endif
++.endif
+
+-$(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
++$(LIBPOPT): $(LIBOBJECTS)
++ $(AR) r $@ $(LIBOBJECTS)
+ $(RANLIB) $@
+
+ distclean: clean
+@@ -67,6 +66,6 @@
+ @rm -rf /tmp/popt-$(VERSION)
+ @echo "The archive is in popt-$(VERSION).tar.gz"
+
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++.if exists(.depend)
++.include ".depend"
++.endif
+--- tools/Makefile.in.orig Wed May 27 10:49:44 1998
++++ tools/Makefile.in Fri Jul 10 01:10:05 1998
+@@ -2,7 +2,7 @@
+ VPATH = @srcdir@
+ top_srcdir = @top_srcdir@
+
+-include ../Makefile.inc
++.include "../Makefile.inc"
+
+ PROGS = rpmlead rpmheader rpmarchive rpmsignature dump dumpdb
+ LOADLIBES = @LIBS@ @LIBMISC@ @LIBINTL@
+@@ -26,6 +26,6 @@
+
+ $(PROGS): ../lib/librpm.a
+
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++.if exists(.depend)
++.include ".depend"
++.endif
diff --git a/misc/rpm/patches/patch-ag b/misc/rpm/patches/patch-ag
new file mode 100644
index 00000000000..4075a3e6e8d
--- /dev/null
+++ b/misc/rpm/patches/patch-ag
@@ -0,0 +1,11 @@
+--- configure.in.orig Wed May 27 10:49:34 1998
++++ configure.in Sat Jul 4 06:17:37 1998
+@@ -17,7 +17,7 @@
+
+ AC_CANONICAL_SYSTEM
+
+-RPMCONFIGDIR='$(libdir)'
++RPMCONFIGDIR='$(datadir)/misc'
+
+ dnl Checks for programs.
+ AC_PROG_CC
diff --git a/misc/rpm/patches/patch-ah b/misc/rpm/patches/patch-ah
new file mode 100644
index 00000000000..329d768774a
--- /dev/null
+++ b/misc/rpm/patches/patch-ah
@@ -0,0 +1,11 @@
+--- configure.orig Wed May 27 10:50:18 1998
++++ configure Sat Jul 4 06:17:46 1998
+@@ -640,7 +640,7 @@
+ program_prefix=${target_alias}-
+
+
+-RPMCONFIGDIR='$(libdir)'
++RPMCONFIGDIR='$(datadir)/share/misc'
+
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2