diff options
61 files changed, 37 insertions, 546 deletions
diff --git a/archivers/Makefile b/archivers/Makefile index e4b8040fbcdb..8d31bb23ec98 100644 --- 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 index 29ca9a71b1c9..0f325ccb1dc5 100644 --- 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 index 39db3da4f7d7..a4fa576602ea 100644 --- 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 index 3593a82a9e91..d3209cafdec7 100644 --- 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 index 115429ab0088..ed721c5c7b78 100644 --- 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 index 58ff3e23ac05..4e2e0f29c6c6 100644 --- 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 index 53414ef88699..17fdef5b66ac 100644 --- 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 index 53414ef88699..17fdef5b66ac 100644 --- 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 index 53414ef88699..17fdef5b66ac 100644 --- 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 index 0e8037f0f9b5..9d49cc5c9c10 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index fa718d4e5c86..e41e74c03e1d 100644 --- 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 index e6c417009a2f..42397f02a9af 100644 --- 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 index b67fae133400..0440bdae104e 100644 --- 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 index e04c9ef3a6a7..78a66d0be3d8 100644 --- 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 index b08fc577ac58..80569e9491b1 100644 --- 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 index 7f5c28d3abe6..7e0b0ceedbbb 100644 --- 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 index 1d384debe85e..e167b38dca58 100644 --- 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 index baa4a1cb8a09..7675c8f2ab76 100644 --- 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 deleted file mode 100644 index 28b2e845d576..000000000000 --- a/misc/rpm/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# 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= 5 -CATEGORIES= misc -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> diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo deleted file mode 100644 index bdc4be2dcb73..000000000000 --- a/misc/rpm/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (rpm-3.0.6.tar.gz) = 71961a796fbb04d2cf22a37337b63da8 diff --git a/misc/rpm/files/patch-av b/misc/rpm/files/patch-av deleted file mode 100644 index 6b13ae1ad123..000000000000 --- a/misc/rpm/files/patch-av +++ /dev/null @@ -1,11 +0,0 @@ ---- aclocal.m4.orig Thu Sep 14 04:41:44 2000 -+++ aclocal.m4 Wed Oct 4 04:45:55 2000 -@@ -738,7 +738,7 @@ - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo -- DATADIRNAME=lib]) -+ DATADIRNAME=share]) - INSTOBJEXT=.mo - fi - fi diff --git a/misc/rpm/files/patch-aw b/misc/rpm/files/patch-aw deleted file mode 100644 index b85c48e92d53..000000000000 --- a/misc/rpm/files/patch-aw +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm.c.orig Thu Sep 14 02:15:44 2000 -+++ rpm.c Thu Oct 5 00:37:37 2000 -@@ -313,7 +313,7 @@ - _("print the version of rpm being used")); - puts( _(" all modes support the following arguments:")); - printHelpLine(_(" --rcfile <file> "), -- _("use <file> instead of /etc/rpmrc and $HOME/.rpmrc")); -+ _("use <file> instead of %%PREFIX%%/etc/rpmrc and $HOME/.rpmrc")); - printHelpLine( " -v ", - _("be a little more verbose")); - printHelpLine( " -vv ", diff --git a/misc/rpm/files/patch-ax b/misc/rpm/files/patch-ax deleted file mode 100644 index d9ffff14843c..000000000000 --- a/misc/rpm/files/patch-ax +++ /dev/null @@ -1,20 +0,0 @@ ---- macros.in.orig Thu Oct 5 13:31:06 2000 -+++ macros.in Thu Oct 5 13:31:25 2000 -@@ -104,7 +104,7 @@ - # will be used if the per-platform macro file does not exist.. - # - %_arch @RPMCANONARCH@ --%_vendor @RPMCANONVENDOR@ -+%_vendor freebsd - %_os @RPMCANONOS@ - %_target_platform %{_target_cpu}-%{_vendor}-%{_target_os} - # -@@ -145,7 +145,7 @@ - %_host @host@ - %_host_alias @host_alias@ - %_host_cpu @host_cpu@ --%_host_vendor @host_vendor@ -+%_host_vendor unknown - %_host_os @host_os@ - %_target %{_host} - %_target_alias %{_host_alias} diff --git a/misc/rpm/files/patch-ay b/misc/rpm/files/patch-ay deleted file mode 100644 index 307bb3fff8db..000000000000 --- a/misc/rpm/files/patch-ay +++ /dev/null @@ -1,49 +0,0 @@ ---- doc/rpm.8.orig Wed Aug 30 05:27:18 2000 -+++ doc/rpm.8 Wed Oct 4 22:46:12 2000 -@@ -86,7 +86,7 @@ - .IP "\fB\-\-rcfile \fI<filelist>\fP" - Each of the files in the colon separated \fI<filelist>\fP is read - sequentially by \fBrpm\fP for configuration information. --The default \fI<filelist>\fP is \fB/usr/lib/rpm/rpmrc:/etc/rpmrc:~/.rpmrc\fP. -+The default \fI<filelist>\fP is \fB%%PREFIX%%/lib/rpm/rpmrc:%%PREFIX%%/etc/rpmrc:~/.rpmrc\fP. - Only the first file in the list must exist, and tildes will be expanded to - the value of \fB$HOME\fP. - .IP "\fB\-\-root \fI<dir>\fP" -@@ -493,17 +493,17 @@ - - For example, to be able to use PGP to sign packages as the user - \fB"John Doe <jdoe@foo.com>"\fP from the key rings located in --\fB/etc/rpm/.pgp\fP using the executable \fB/usr/bin/pgp\fP you would include -+\fB%%PREFIX%%/etc/rpm/.pgp\fP using the executable \fB%%PREFIX%%/bin/pgp\fP you would include - - .I "\fB%_signature pgp\fP" - --.I "\fB%_pgp_path /etc/rpm/.pgp\fP" -+.I "\fB%_pgp_path %%PREFIX%%/etc/rpm/.pgp\fP" - - .I "\fB%_pgp_name John Doe <jdoe@foo.com>\fP" - --.I "\fB%_pgpbin /usr/bin/pgp\fP" -+.I "\fB%_pgpbin %%PREFIX%%/bin/pgp\fP" - --in a macro configuration file. Use \fB/etc/rpm/macros\fP for per-system -+in a macro configuration file. Use \fB%%PREIFX%%/etc/rpm/macros\fP for per-system - configuration and \fB~/.rpmmacros\fP for per-user configuration. - - .SH REBUILD DATABASE OPTIONS -@@ -575,11 +575,11 @@ - - .SH FILES - .nf --/usr/lib/rpm/rpmrc --/etc/rpmrc -+%%PREFIX%%/lib/rpm/rpmrc -+%%PREIFX%%/etc/rpmrc - ~/.rpmrc --/usr/lib/rpm/macros --/etc/rpm/macros -+%%PREFIX%%/lib/rpm/macros -+%%PREFIX%%/etc/rpm/macros - ~/.rpmmacros - /var/lib/rpm/conflictsindex.rpm - /var/lib/rpm/fileindex.rpm diff --git a/misc/rpm/files/patch-ba b/misc/rpm/files/patch-ba deleted file mode 100644 index a41025f75309..000000000000 --- a/misc/rpm/files/patch-ba +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/macro.c.orig Mon Jul 10 00:35:57 2000 -+++ lib/macro.c Wed Oct 4 23:04:43 2000 -@@ -1608,7 +1608,7 @@ - - #if defined(EVAL_MACROS) - --char *macrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros"; -+char *macrofiles = "%%PREFIX%%/lib/rpm/macros:%%PREFIX%%/etc/rpm/macros:~/.rpmmacros"; - - int - main(int argc, char *argv[]) diff --git a/misc/rpm/files/patch-bb b/misc/rpm/files/patch-bb deleted file mode 100644 index f94da33da1c3..000000000000 --- a/misc/rpm/files/patch-bb +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/rpmrc.c.orig Thu Sep 14 02:29:18 2000 -+++ lib/rpmrc.c Wed Oct 4 23:03:36 2000 -@@ -13,7 +13,7 @@ - - #include "misc.h" - --static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc"; -+static const char *defrcfiles = LIBRPMRC_FILENAME ":%%PREFIX%%/etc/rpmrc:~/.rpmrc"; - - struct machCacheEntry { - const char * name; -@@ -858,7 +858,7 @@ - /* we are on ncr-sysv4 */ - char *prelid = NULL; - FD_t fd; -- fd = Fopen("/etc/.relid", "r.fdio"); -+ fd = Fopen("%%PREFIX%%/etc/.relid", "r.fdio"); - if (!Ferror(fd)) { - chptr = (char *) xcalloc(1, 256); - if (chptr != NULL) { diff --git a/misc/rpm/files/patch-bc b/misc/rpm/files/patch-bc deleted file mode 100644 index f081ede2c5a1..000000000000 --- a/misc/rpm/files/patch-bc +++ /dev/null @@ -1,57 +0,0 @@ ---- configure.in.orig Thu Sep 14 04:39:40 2000 -+++ configure.in Wed Oct 4 23:13:46 2000 -@@ -369,7 +369,7 @@ - AC_CHECK_HEADERS(netinet/in_systm.h) - AC_CHECK_HEADERS(machine/types.h) - AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h) --AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h) -+AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/param.h sys/vmount.h) - AC_CHECK_HEADERS(bzlib.h libio.h zlib.h) - AC_CHECK_HEADERS(err.h mcheck.h) - -@@ -431,6 +431,9 @@ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif - #include <sys/mount.h> ], - [struct statfs sfs;], - [AC_MSG_RESULT(in sys/mount.h) -@@ -744,7 +747,7 @@ - AC_SUBST(ROOT_GROUP) - - if test "x$varprefix" = "x"; then -- varprefix=`echo $prefix | sed 's/usr/var/'` -+ varprefix=`echo /var` - test "x$prefix" = xNONE && varprefix=`echo $ac_default_prefix | sed 's/usr/var/'` - fi - AC_SUBST(varprefix) -@@ -872,7 +875,7 @@ - RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" - AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR") - AC_SUBST(RPMCONFIGDIR) --SYSCONFIGDIR="`echo /etc/rpm`" -+SYSCONFIGDIR="`echo ${usrprefix}/etc/rpm`" - AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR") - AC_SUBST(SYSCONFIGDIR) - LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc" -@@ -911,7 +914,6 @@ - dnl # XXX Propagate -lucb to popt ... - dnl export LIBS INCPATH CONFIG_SITE - --AC_CONFIG_SUBDIRS(popt) - AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat - lib/Makefile build/Makefile tools/Makefile scripts/Makefile - tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile -@@ -919,8 +921,7 @@ - doc/Makefile doc/manual/Makefile - doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile - python/Makefile perl/Makefile perl/Makefile.PL], -- [echo timestamp > popt/stamp-h.in -- echo timestamp > stamp-h.in]) -+ [echo timestamp > stamp-h.in]) - dnl touch Makefile.in - dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) - diff --git a/misc/rpm/files/patch-bd b/misc/rpm/files/patch-bd deleted file mode 100644 index 5d3992602259..000000000000 --- a/misc/rpm/files/patch-bd +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.am.orig Thu Sep 14 02:36:40 2000 -+++ Makefile.am Wed Oct 4 06:08:38 2000 -@@ -11,19 +11,19 @@ - rpm.magic rpmpopt rpm.spec installplatform - - # XXX TODO: python perl --SUBDIRS = intl po popt lib build misc tools scripts tests doc . -+SUBDIRS = intl po lib build misc tools scripts tests . - --INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ -+INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib \ - @INCPATH@ - --myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt -+myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib - - # XXX libtool can/should generate dependent libs. - # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?) - myldadd= \ - $(top_builddir)/build/.libs/librpmbuild.a \ - $(top_builddir)/lib/.libs/librpm.a \ -- $(top_builddir)/popt/.libs/libpopt.a \ -+ -lpopt \ - @INTLLIBS@ @LIBMISC@ - - LDFLAGS = @LDFLAGS_STATIC@ $(myldflags) diff --git a/misc/rpm/files/patch-be b/misc/rpm/files/patch-be deleted file mode 100644 index 5c34517e9088..000000000000 --- a/misc/rpm/files/patch-be +++ /dev/null @@ -1,11 +0,0 @@ ---- build/Makefile.am.orig Wed Jun 14 21:34:28 2000 -+++ build/Makefile.am Wed Oct 4 05:02:45 2000 -@@ -2,7 +2,7 @@ - - AUTOMAKE_OPTIONS = 1.4 foreign - --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ -+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib \ - @INCPATH@ - - pkgincdir = $(pkgincludedir) diff --git a/misc/rpm/files/patch-bf b/misc/rpm/files/patch-bf deleted file mode 100644 index e7fa9954a817..000000000000 --- a/misc/rpm/files/patch-bf +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/Makefile.am.orig Mon Jul 17 03:49:43 2000 -+++ lib/Makefile.am Wed Oct 4 05:32:09 2000 -@@ -2,7 +2,7 @@ - - AUTOMAKE_OPTIONS = 1.4 foreign - --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@ -+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@ - - pkgincdir = $(pkgincludedir) - pkginc_HEADERS = \ -@@ -12,7 +12,7 @@ - lookup.h md5.h rpm_malloc.h \ - rpmdb.h rpmlead.h signature.h - --mylibpaths= -L$(top_builddir)/lib -L$(top_builddir)/popt -+mylibpaths= -L$(top_builddir)/lib - mylibs= -lrpm -lpopt @INTLLIBS@ @LIBMISC@ - - lib_LTLIBRARIES = librpm.la diff --git a/misc/rpm/files/patch-bg b/misc/rpm/files/patch-bg deleted file mode 100644 index c3968cf1ce7f..000000000000 --- a/misc/rpm/files/patch-bg +++ /dev/null @@ -1,24 +0,0 @@ ---- tools/Makefile.am.orig Wed Jun 14 21:34:51 2000 -+++ tools/Makefile.am Wed Oct 4 05:34:26 2000 -@@ -3,18 +3,18 @@ - AUTOMAKE_OPTIONS = 1.4 foreign - - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build \ -- -I$(top_srcdir)/lib -I$(top_srcdir)/popt \ -+ -I$(top_srcdir)/lib \ - @INCPATH@ -I$(top_srcdir)/misc - - EXTRA_DIST = fstrcmp.c message.c str-list.c rpmchecksig.c - - EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject - --myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt -+myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib - # XXX should libtool generate dependent libs? - myldadd= $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la \ -- $(top_builddir)/popt/libpopt.la \ -+ -lpopt \ - @INTLLIBS@ @LIBMISC@ - - LDFLAGS = $(myldflags) diff --git a/misc/rpm/files/patch-bh b/misc/rpm/files/patch-bh deleted file mode 100644 index 527ef4c3f99d..000000000000 --- a/misc/rpm/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm2cpio.c.orig Wed Oct 25 19:26:40 2000 -+++ rpm2cpio.c Wed Oct 25 19:26:59 2000 -@@ -55,7 +55,7 @@ - } - - gzdi = Fdopen(fdi, rpmio_flags); /* XXX gzdi == fdi */ -- if (gzdi == NULL || Ferror(gzdi)) { -+ if (gzdi == NULL) { - fprintf(stderr, _("cannot re-open payload: %s\n"), Fstrerror(gzdi)); - exit(EXIT_FAILURE); - } diff --git a/misc/rpm/files/patch-bi b/misc/rpm/files/patch-bi deleted file mode 100644 index 2f4b57a890a3..000000000000 --- a/misc/rpm/files/patch-bi +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 diff --git a/misc/rpm/files/patch-bj b/misc/rpm/files/patch-bj deleted file mode 100644 index b48019f66759..000000000000 --- a/misc/rpm/files/patch-bj +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 diff --git a/misc/rpm/pkg-comment b/misc/rpm/pkg-comment deleted file mode 100644 index b312119efb71..000000000000 --- a/misc/rpm/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -The Red Hat Package Manager diff --git a/misc/rpm/pkg-descr b/misc/rpm/pkg-descr deleted file mode 100644 index 72dc8b71f609..000000000000 --- a/misc/rpm/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This is the Red Hat Package Manager. - -FYI: -There is also a rpm2cpio converter written in perl. You don't have to -install the whole RPM manager to get the files in an RPM. - -WWW: http://www.rpm.org/ diff --git a/misc/rpm/pkg-plist b/misc/rpm/pkg-plist deleted file mode 100644 index 17db8f9f87ec..000000000000 --- a/misc/rpm/pkg-plist +++ /dev/null @@ -1,101 +0,0 @@ -bin/gendiff -bin/rpm -bin/rpm2cpio -include/rpm/dbindex.h -include/rpm/header.h -include/rpm/misc.h -include/rpm/rpmbuild.h -include/rpm/rpmio.h -include/rpm/rpmlib.h -include/rpm/rpmmacro.h -include/rpm/rpmspec.h -include/rpm/rpmurl.h -include/rpm/stringbuf.h -lib/librpm.a -lib/librpm.so -lib/librpm.so.0 -lib/librpmbuild.a -lib/librpmbuild.so -lib/librpmbuild.so.0 -lib/rpm/brp-compress -lib/rpm/brp-redhat -lib/rpm/brp-sparc64-linux -lib/rpm/brp-strip -lib/rpm/brp-strip-comment-note -lib/rpm/check-prereqs -lib/rpm/config.guess -lib/rpm/config.sub -lib/rpm/convertrpmrc.sh -lib/rpm/cpanflute -lib/rpm/find-lang.sh -lib/rpm/find-prov.pl -lib/rpm/find-provides -lib/rpm/find-provides.perl -lib/rpm/find-req.pl -lib/rpm/find-requires -lib/rpm/find-requires.perl -lib/rpm/get_magic.pl -lib/rpm/getpo.sh -lib/rpm/http.req -lib/rpm/macros -lib/rpm/magic.prov -lib/rpm/magic.req -lib/rpm/mkinstalldirs -lib/rpm/perl.prov -lib/rpm/perl.req -lib/rpm/rpmdiff -lib/rpm/rpmdiff.cgi -lib/rpm/rpmgettext -lib/rpm/rpmpopt -lib/rpm/rpmputtext -lib/rpm/rpmrc -lib/rpm/u_pkg.sh -lib/rpm/vpkg-provides.sh -lib/rpm/vpkg-provides2.sh -lib/rpmpopt -lib/rpmrc -share/locale/cs/LC_MESSAGES/rpm.mo -share/locale/de/LC_MESSAGES/rpm.mo -share/locale/fi/LC_MESSAGES/rpm.mo -share/locale/fr/LC_MESSAGES/rpm.mo -share/locale/ja/LC_MESSAGES/rpm.mo -share/locale/pl/LC_MESSAGES/rpm.mo -share/locale/pt_BR/LC_MESSAGES/rpm.mo -share/locale/ru/LC_MESSAGES/rpm.mo -share/locale/sk/LC_MESSAGES/rpm.mo -share/locale/sl/LC_MESSAGES/rpm.mo -share/locale/sr/LC_MESSAGES/rpm.mo -share/locale/sv/LC_MESSAGES/rpm.mo -share/locale/tr/LC_MESSAGES/rpm.mo -@dirrm lib/rpm -@dirrm include/rpm -@unexec rmdir %D/src/redhat/SRPMS 2>/dev/null || true -@unexec rmdir %D/src/redhat/SPECS 2>/dev/null || true -@unexec rmdir %D/src/redhat/SOURCES 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS/noarch 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS/athlon 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS/i686 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS/i586 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS/i486 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS/i386 2>/dev/null || true -@unexec rmdir %D/src/redhat/RPMS 2>/dev/null || true -@unexec rmdir %D/src/redhat/BUILD 2>/dev/null || true -@unexec rmdir %D/src/redhat 2>/dev/null || true -@unexec rmdir %D/src 2>/dev/null || true -@unexec rmdir /var/lib/rpm 2>/dev/null || true -@unexec rmdir /var/lib 2>/dev/null || true -@exec mkdir -p /var/lib -@exec mkdir -p /var/lib/rpm -@exec mkdir -p %D/src -@exec mkdir -p %D/src/redhat -@exec mkdir -p %D/src/redhat/BUILD -@exec mkdir -p %D/src/redhat/RPMS -@exec mkdir -p %D/src/redhat/RPMS/athlon -@exec mkdir -p %D/src/redhat/RPMS/i386 -@exec mkdir -p %D/src/redhat/RPMS/i486 -@exec mkdir -p %D/src/redhat/RPMS/i586 -@exec mkdir -p %D/src/redhat/RPMS/i686 -@exec mkdir -p %D/src/redhat/RPMS/noarch -@exec mkdir -p %D/src/redhat/SOURCES -@exec mkdir -p %D/src/redhat/SPECS -@exec mkdir -p %D/src/redhat/SRPMS diff --git a/misc/rpm2cpio/Makefile b/misc/rpm2cpio/Makefile deleted file mode 100644 index 39db3da4f7d7..000000000000 --- a/misc/rpm2cpio/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: rpm2cpio -# Date created: Sun Jul 18 21:51:23 MET DST 1999 -# Whom: Juergen Lock <nox@jelal.kn-bremen.de> -# -# $FreeBSD$ -# - -PORTNAME= rpm2cpio -PORTVERSION= 1.1 -CATEGORIES= misc -MASTER_SITES= http://www.iagora.com/~espel/ -DISTFILES= ${PORTNAME} - -MAINTAINER= nox@jelal.kn-bremen.de - -NO_WRKSUBDIR= yes -EXTRACT_CMD= ${CP} -EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= . - -USE_PERL5= yes - -do-build: - ${PERL5} -i.bak -p -e "if (1 .. 1) {s-^#!/usr/bin/perl-#!${PERL}-;}" ${WRKDIR}/rpm2cpio - -do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/rpm2cpio ${PREFIX}/bin - -.include <bsd.port.mk> diff --git a/misc/rpm2cpio/distinfo b/misc/rpm2cpio/distinfo deleted file mode 100644 index 9f52ac1bd4bb..000000000000 --- a/misc/rpm2cpio/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (rpm2cpio) = 60e416bc9a91870944a9fc2a6d706478 diff --git a/misc/rpm2cpio/pkg-comment b/misc/rpm2cpio/pkg-comment deleted file mode 100644 index 8aa8b0dc016d..000000000000 --- a/misc/rpm2cpio/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Convert .rpm files for extraction with /usr/bin/cpio, needs just perl diff --git a/misc/rpm2cpio/pkg-descr b/misc/rpm2cpio/pkg-descr deleted file mode 100644 index 538443c4ad5c..000000000000 --- a/misc/rpm2cpio/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Convert .rpm files for extraction with /usr/bin/cpio - -Quoting the author: - -why does the world need another rpm2cpio? because the existing one -won't build unless you have half a ton of things that aren't really -required for it, since it uses the same library used to extract RPM's. -in particular, it won't build on the HPsUX box i'm on. - -(this one needs just perl) - -WWW: http://www.iagora.com/~espel/ diff --git a/misc/rpm2cpio/pkg-plist b/misc/rpm2cpio/pkg-plist deleted file mode 100644 index 2a1399eaaa02..000000000000 --- a/misc/rpm2cpio/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/rpm2cpio diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile index 3593a82a9e91..d3209cafdec7 100644 --- a/multimedia/linux-realplayer/Makefile +++ b/multimedia/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/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile index b08fc577ac58..80569e9491b1 100644 --- a/multimedia/linux-xmovie/Makefile +++ b/multimedia/linux-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/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile index b08fc577ac58..80569e9491b1 100644 --- a/multimedia/xmovie/Makefile +++ b/multimedia/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/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile index 1d7f34373255..807b6e779362 100644 --- a/print/bjfiltercom/Makefile +++ b/print/bjfiltercom/Makefile @@ -17,7 +17,7 @@ EXTRACT_ONLY= ${RPMFILE} MAINTAINER= taoka@FreeBSD.org -BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/misc/rpm2cpio +BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio .if defined(SLAVE_PORT) RUN_DEPENDS= stsmon:${PORTSDIR}/print/bjfiltercom \ pstops:${PORTSDIR}/print/psutils-${PAPERSIZE} diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile index 0041f944e1a9..12f0d372deff 100644 --- a/sysutils/logrotate/Makefile +++ b/sysutils/logrotate/Makefile @@ -15,7 +15,7 @@ EXTRACT_SUFX= -1.src.rpm MAINTAINER= ycheng@sinica.edu.tw -BUILD_DEPENDS= ${LOCALBASE}/bin/rpm2cpio:${PORTSDIR}/misc/rpm +BUILD_DEPENDS= ${LOCALBASE}/bin/rpm2cpio:${PORTSDIR}/archivers/rpm LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 5dd1fb57279f..afa493d0180f 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= unstable/sources/nautilus MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/misc/rpm +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ gtkhtml.8:${PORTSDIR}/www/gtkhtml \ ghttp.1:${PORTSDIR}/www/libghttp \ diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 5dd1fb57279f..afa493d0180f 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= unstable/sources/nautilus MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/misc/rpm +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ gtkhtml.8:${PORTSDIR}/www/gtkhtml \ ghttp.1:${PORTSDIR}/www/libghttp \ diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile index bfcbf26f3c24..17d1964c03d4 100644 --- a/x11-fm/xnc/Makefile +++ b/x11-fm/xnc/Makefile @@ -16,7 +16,7 @@ MAINTAINER= demon@FreeBSD.org # xnc will use the following programs if you have them installed. #RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ # unzip:${PORTSDIR}/archivers/unzip \ -# rpm:${PORTSDIR}/misc/rpm \ +# rpm:${PORTSDIR}/archivers/rpm \ # rar:${PORTSDIR}/archivers/rar \ # unarj:${PORTSDIR}/archivers/unarj \ # lha:${PORTSDIR}/archivers/lha \ diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile index 1ea580e14634..29dceb4fa417 100644 --- a/x11-toolkits/linux-f10-gtk/Makefile +++ b/x11-toolkits/linux-f10-gtk/Makefile @@ -17,7 +17,7 @@ DISTFILES= ${RPM_SET} MAINTAINER?= ports@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/misc/rpm +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm USE_LINUX_PREFIX= yes ONLY_FOR_ARCHS= i386 alpha diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile index 1ea580e14634..29dceb4fa417 100644 --- a/x11-toolkits/linux-f8-gtk/Makefile +++ b/x11-toolkits/linux-f8-gtk/Makefile @@ -17,7 +17,7 @@ DISTFILES= ${RPM_SET} MAINTAINER?= ports@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/misc/rpm +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm USE_LINUX_PREFIX= yes ONLY_FOR_ARCHS= i386 alpha diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile index 1ea580e14634..29dceb4fa417 100644 --- a/x11-toolkits/linux-gtk/Makefile +++ b/x11-toolkits/linux-gtk/Makefile @@ -17,7 +17,7 @@ DISTFILES= ${RPM_SET} MAINTAINER?= ports@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/misc/rpm +BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm USE_LINUX_PREFIX= yes ONLY_FOR_ARCHS= i386 alpha diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index a634b1e609d3..670cdcaa4c8b 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://ulli.linuxave.net/wmakerconf/ MAINTAINER= dr@domix.de -RUN_DEPENDS= rpm:${PORTSDIR}/misc/rpm \ +RUN_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ bunzip2:${PORTSDIR}/archivers/bzip2 LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ jpeg.9:${PORTSDIR}/graphics/jpeg \ |