rpm' and rpm2cpio' have been repocopied from "misc" to "archivers".

truenas · Mar 20, 2001 · 30af7b6 · 30af7b6
1 parent 56ec8c7
commit 30af7b6
Showing 61 changed files with 37 additions and 546 deletions.
diff --git a/archivers/Makefile b/archivers/Makefile
@@ -30,6 +30,8 @@
     SUBDIR += pkzip
     SUBDIR += ppunpack
     SUBDIR += rar
+    SUBDIR += rpm
+    SUBDIR += rpm2cpio
     SUBDIR += ruby-zlib
     SUBDIR += sectar
     SUBDIR += ucl

diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	rpm
 PORTVERSION=	3.0.6
 PORTREVISION=	4
-CATEGORIES=	misc
+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/rpm2cpio/Makefile b/archivers/rpm2cpio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rpm2cpio
 PORTVERSION=	1.1
-CATEGORIES=	misc
+CATEGORIES=	archivers
 MASTER_SITES=	http://www.iagora.com/~espel/
 DISTFILES=	${PORTNAME}
 

diff --git a/audio/linux-realplayer/Makefile b/audio/linux-realplayer/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	_rpm
 MAINTAINER=	vns@delta.odessa.ua
 
 RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 EXTRACT_CMD=	rpm2cpio
 EXTRACT_BEFORE_ARGS=

diff --git a/chinese/cle_base/Makefile b/chinese/cle_base/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=
 
 MAINTAINER=		keith@FreeBSD.org
 
-RUN_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+RUN_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		zh-rpm

diff --git a/chinese/linux-gtk/Makefile b/chinese/linux-gtk/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	gtk+-1.2.6-7CLE.i386.rpm
 
 MAINTAINER=	keith@FreeBSD.org
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	/compat/linux/CLE-0.9p1:${PORTSDIR}/chinese/cle_base
 
 DIST_SUBDIR=	zh-rpm

diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
@@ -24,7 +24,7 @@ PATCHFILES=
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=		\
 	${PREFIX}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
 

diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
@@ -24,7 +24,7 @@ PATCHFILES=
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=		\
 	${PREFIX}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
 

diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
@@ -24,7 +24,7 @@ PATCHFILES=
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=		\
 	${PREFIX}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
 

diff --git a/devel/newt/Makefile b/devel/newt/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
 		tcl82.1:${PORTSDIR}/lang/tcl82 \
 		popt.0:${PORTSDIR}/devel/popt
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm \
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm \
 		python1.5:${PORTSDIR}/lang/python15
 
 USE_GMAKE=	yes

diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		marcel@FreeBSD.org
 
-BUILD_DEPENDS=		rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
 DIST_SUBDIR=		rpm

diff --git a/emulators/osf1_base/Makefile b/emulators/osf1_base/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 ONLY_FOR_ARCHS=	alpha
 

diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes

diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
@@ -18,7 +18,7 @@ PATCHFILES=
 
 MAINTAINER=		mastake@msel.t.u-tokyo.ac.jp
 
-BUILD_DEPENDS=		rpm2cpio:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=		rpm2cpio:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=		\
 	/compat/linux/lib/ld-linux.so.2:${PORTSDIR}/emulators/linux_base
 

diff --git a/graphics/xmovie/Makefile b/graphics/xmovie/Makefile
@@ -13,8 +13,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.i386.rpm
 
 MAINTAINER=	sanpei@FreeBSD.org
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm \
-		rpm2cpio:${PORTSDIR}/misc/rpm2cpio
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
 RUN_DEPENDS=	${LINUX_BASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 		${LINUX_BASE}/usr/lib/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg \
 		${LINUX_BASE}/usr/lib/libpng.so.2.1.0.3:${PORTSDIR}/graphics/linux-png

diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	cjh@FreeBSD.org
 
-BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
 
 USE_X_PREFIX=	yes
 

diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	obrien@FreeBSD.org
 
 RESTRICTED=	"Distribution not allowed"
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/misc/rpm
+BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=	alpha
 

diff --git a/misc/Makefile b/misc/Makefile
@@ -128,8 +128,6 @@
     SUBDIR += quranref
     SUBDIR += rfc
     SUBDIR += rname
-    SUBDIR += rpm
-    SUBDIR += rpm2cpio
     SUBDIR += rtfm
     SUBDIR += screen
     SUBDIR += scriptkit

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo
diff --git a/misc/rpm/files/patch-av b/misc/rpm/files/patch-av
diff --git a/misc/rpm/files/patch-aw b/misc/rpm/files/patch-aw
diff --git a/misc/rpm/files/patch-ax b/misc/rpm/files/patch-ax
diff --git a/misc/rpm/files/patch-ay b/misc/rpm/files/patch-ay
diff --git a/misc/rpm/files/patch-ba b/misc/rpm/files/patch-ba
diff --git a/misc/rpm/files/patch-bb b/misc/rpm/files/patch-bb