diff options
| author | hubertf <hubertf> | 1997-12-17 10:15:55 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1997-12-17 10:15:55 +0000 |
| commit | 6618cfa285e252e24de7b2036f6bab2acf0ae156 (patch) | |
| tree | fdfe718d2aa102b4e13932ee77ef18a5ed854347 /misc/rpm/patches | |
| parent | e6fb45b1628e4a5325c7e29a51f974af6888fb5d (diff) | |
| download | pkgsrc-6618cfa285e252e24de7b2036f6bab2acf0ae156.tar.gz | |
Update for 2.4.10, from FreeBSD
Diffstat (limited to 'misc/rpm/patches')
| -rw-r--r-- | misc/rpm/patches/patch-ac | 22 | ||||
| -rw-r--r-- | misc/rpm/patches/patch-af | 15 |
2 files changed, 5 insertions, 32 deletions
diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac index d69ee744133..d1ea9e9e6a1 100644 --- a/misc/rpm/patches/patch-ac +++ b/misc/rpm/patches/patch-ac @@ -1,5 +1,5 @@ ---- misc/miscfn.h.orig Fri Oct 10 23:29:41 1997 -+++ misc/miscfn.h Sun Oct 26 04:19:51 1997 +--- misc/miscfn.h.orig Fri Jun 27 23:55:33 1997 ++++ misc/miscfn.h Wed Jul 2 14:31:14 1997 @@ -2,6 +2,7 @@ #define H_MISCFN @@ -8,21 +8,3 @@ #if HAVE_FNMATCH_H #include <fnmatch.h> -@@ -35,13 +36,17 @@ - char *realpath(const char *path, char resolved_path []); - #endif - -+#if 0 - #if NEED_TIMEZONE - #include <sys/stdtypes.h> - extern time_t timezone; - #endif -+#endif - - #if NEED_MYREALLOC -+#if 0 - #include <sys/stdtypes.h> -+#endif - #define realloc(ptr,size) myrealloc(ptr,size) - extern void *myrealloc(void *, size_t); - #endif diff --git a/misc/rpm/patches/patch-af b/misc/rpm/patches/patch-af index ba753cfe2fd..63339da7dff 100644 --- a/misc/rpm/patches/patch-af +++ b/misc/rpm/patches/patch-af @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Oct 10 23:29:38 1997 -+++ Makefile.in Sun Oct 26 04:17:26 1997 +--- Makefile.in.orig Fri Oct 31 20:37:13 1997 ++++ Makefile.in Thu Nov 20 13:16:39 1997 @@ -25,6 +25,7 @@ RPMBINDIR=$(subst usr/bin,bin,$(BINDIR)) MANDIR=$(prefix)/man/man8 @@ -8,19 +8,10 @@ INCDIR=$(prefix)/include/rpm ETCDIR=$(ROOT)/etc -@@ -35,7 +36,7 @@ - OTHERSUBDIRS = docs autodeps - OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o @GETTEXTSTUB@ - PROGS = @RPM@ rpm2cpio --LIBS = @LIBS@ @LIBINTL@ @LIBDL@ -+LIBS = @LIBS@ @LIBINTL@ @LIBDL@ -lcompat - LOADLIBES = -lbuild popt/libpopt.a $(topdir)/lib/librpm.a -lmisc - - SOURCES = $(subst .o,.c,$(OBJS)) @@ -49,7 +50,7 @@ all: $(TARGET) - rpm: lib/librpm.a build/libbuild.a misc/libmisc.a $(OBJS) + rpm: lib/librpm.a build/libbuild.a @MISCPATH@ $(OBJS) - $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \ + $(CC) -o rpm $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \ $(LIBEFENCE) |