diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-03-20 21:29:26 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-03-20 21:29:26 +0000 |
| commit | a7514c177d51095ff13a2fdb89eab4edd1715088 (patch) | |
| tree | c06c949db9f281e9806086a2c82e75847b0731f0 /archivers/rpm | |
| parent | Bring in the enhancements I submitted to mharo some time ago and bump (diff) | |
Add dummy getmntent() func.
PR: 24570
Submitted by: Roman Shterenzon<roman@xpert.com>
Notes
Notes:
svn path=/head/; revision=40123
Diffstat (limited to 'archivers/rpm')
| -rw-r--r-- | archivers/rpm/Makefile | 2 | ||||
| -rw-r--r-- | archivers/rpm/files/patch-bi | 18 | ||||
| -rw-r--r-- | archivers/rpm/files/patch-bj | 14 |
3 files changed, 30 insertions, 4 deletions
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index 0f325ccb1dc5..9c96bd36f3c3 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -7,7 +7,7 @@ PORTNAME= rpm PORTVERSION= 3.0.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= archivers MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \ ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ diff --git a/archivers/rpm/files/patch-bi b/archivers/rpm/files/patch-bi index d4e23f73235b..2f4b57a890a3 100644 --- a/archivers/rpm/files/patch-bi +++ b/archivers/rpm/files/patch-bi @@ -1,6 +1,18 @@ ---- lib/fs.c.orig Thu Nov 2 12:54:47 2000 -+++ lib/fs.c Thu Nov 2 12:55:32 2000 -@@ -129,8 +129,10 @@ +--- lib/fs.c.orig Wed Jun 14 21:34:30 2000 ++++ lib/fs.c Tue Mar 20 22:24:58 2001 +@@ -12,6 +12,11 @@ + /*@only@*/ /*@null@*/ static const char ** fsnames = NULL; + static int numFilesystems = 0; + ++/* dummy getmntent() for FreeBSD */ ++our_mntent *getmntent(FILE *filep) { ++ return NULL; ++} ++ + void freeFilesystems(void) + { + if (filesystems) { +@@ -129,8 +134,10 @@ # if GETMNTENT_ONE || GETMNTENT_TWO mtab = fopen(MOUNTED, "r"); if (!mtab) { diff --git a/archivers/rpm/files/patch-bj b/archivers/rpm/files/patch-bj new file mode 100644 index 000000000000..b48019f66759 --- /dev/null +++ b/archivers/rpm/files/patch-bj @@ -0,0 +1,14 @@ +--- system.h.orig Tue Mar 20 22:24:05 2001 ++++ system.h Tue Mar 20 22:24:30 2001 +@@ -351,9 +351,9 @@ + # elif HAVE_STRUCT_MNTTAB + # include <stdio.h> + # include <mnttab.h> +- struct our_mntent { ++ typedef struct our_mntent { + char * our_mntdir; +- }; ++ } our_mntent; + struct our_mntent *getmntent(FILE *filep); + # define our_mntent struct our_mntent + # else |