Index: head/archivers/rpm/Makefile
===================================================================
--- head/archivers/rpm/Makefile	(revision 40122)
+++ head/archivers/rpm/Makefile	(revision 40123)
@@ -1,42 +1,42 @@
 # New ports collection makefile for:	rpm
 # Date created:		30 April 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 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/
 
 MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2 \
 		intl.1:${PORTSDIR}/devel/gettext \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-glob
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
 MAN1=		gendiff.1
 MAN8=		rpm.8 rpm2cpio.8
 
 post-patch:
 .for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
 .endfor
 
 post-install:
 		${INSTALL_MAN} ${WRKSRC}/doc/gendiff.1 ${PREFIX}/man/man1
 		${INSTALL_MAN} ${WRKSRC}/doc/rpm.8 ${PREFIX}/man/man8
 		${INSTALL_MAN} ${WRKSRC}/doc/rpm2cpio.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>

Property changes on: head/archivers/rpm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.34
\ No newline at end of property
+1.35
\ No newline at end of property
Index: head/archivers/rpm/files/patch-bi
===================================================================
--- head/archivers/rpm/files/patch-bi	(revision 40122)
+++ head/archivers/rpm/files/patch-bi	(revision 40123)
@@ -1,13 +1,25 @@
---- 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) {
 +/*
  	    rpmError(RPMERR_MTAB, _("failed to open %s: %s"), MOUNTED, 
  		     strerror(errno));
 +*/
  	    return 1;
  	}
  #   elif HAVE_GETMNTINFO_R

Property changes on: head/archivers/rpm/files/patch-bi
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/archivers/rpm/files/patch-bj
===================================================================
--- head/archivers/rpm/files/patch-bj	(nonexistent)
+++ head/archivers/rpm/files/patch-bj	(revision 40123)
@@ -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

Property changes on: head/archivers/rpm/files/patch-bj
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property