svn commit: r360345 - in head: archivers/deco archivers/xarchive devel/quilt misc/lesspipe print/apsfilter

[Baptiste Daroussin]

Author: bapt
Date: Thu Jul  3 09:13:35 2014
New Revision: 360345
URL: http://svnweb.freebsd.org/changeset/ports/360345
QAT: https://qat.redports.org/buildarchive/r360345/

Log:
  Switch to use rpm 4 as the default rpm

Modified:
  head/archivers/deco/Makefile
  head/archivers/xarchive/Makefile
  head/devel/quilt/Makefile
  head/devel/quilt/pkg-plist
  head/misc/lesspipe/Makefile
  head/print/apsfilter/Makefile

Modified: head/archivers/deco/Makefile
==============================================================================
--- head/archivers/deco/Makefile	Thu Jul  3 08:36:12 2014	(r360344)
+++ head/archivers/deco/Makefile	Thu Jul  3 09:13:35 2014	(r360345)
@@ -2,6 +2,7 @@
 
 PORTNAME=	deco
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://hartlich.com/deco/download/:site1 \
 		http://hartlich.com/deco/archive/download/:site2
@@ -19,7 +20,7 @@ RUN_DEPENDS=	arc:${PORTSDIR}/archivers/a
 		dpkg:${PORTSDIR}/archivers/dpkg \
 		lzop:${PORTSDIR}/archivers/lzop \
 		7z:${PORTSDIR}/archivers/p7zip \
-		rpm:${PORTSDIR}/archivers/rpm \
+		rpm:${PORTSDIR}/archivers/rpm4 \
 		rzip:${PORTSDIR}/archivers/rzip \
 		unace:${PORTSDIR}/archivers/unace \
 		unrar:${PORTSDIR}/archivers/unrar \

Modified: head/archivers/xarchive/Makefile
==============================================================================
--- head/archivers/xarchive/Makefile	Thu Jul  3 08:36:12 2014	(r360344)
+++ head/archivers/xarchive/Makefile	Thu Jul  3 09:13:35 2014	(r360345)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xarchive
 DISTVERSION=	0.2.8-6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	archivers
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
@@ -33,7 +33,7 @@ DEB_RUN_DEPENDS+=	dpkg-deb:${PORTSDIR}/a
 RAR_RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar \
 		unrar:${PORTSDIR}/archivers/unrar
 RPM_RUN_DEPENDS+=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
-		rpm:${PORTSDIR}/archivers/rpm
+		rpm:${PORTSDIR}/archivers/rpm4
 ZIP_RUN_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 

Modified: head/devel/quilt/Makefile
==============================================================================
--- head/devel/quilt/Makefile	Thu Jul  3 08:36:12 2014	(r360344)
+++ head/devel/quilt/Makefile	Thu Jul  3 09:13:35 2014	(r360345)
@@ -3,6 +3,7 @@
 
 PORTNAME=	quilt
 PORTVERSION=	0.61
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	quilt
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/b
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		formail:${PORTSDIR}/mail/procmail
 
-USES=		gmake perl5
+USES=		desthack gmake perl5
 
 OPTIONS_DEFINE=	RPMBUILD DOCS NLS
 OPTIONS_SUB=	yes
@@ -32,17 +33,15 @@ CONFIGURE_ARGS=	--with-sed=${LOCALBASE}/
 		--without-getopt \
 		--with-patch=${LOCALBASE}/bin/gpatch
 
-MAN1=		guards.1 quilt.1
 PORTDOCS=	README README.MAIL quilt.pdf
 
-RPMBUILD_BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-RPMBUILD_RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
+RPMBUILD_BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
+RPMBUILD_RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
 RPMBUILD_CONFIGURE_OFF=	--without-rpmbuild
 
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if !exists(${LOCALBASE}/sbin/sendmail)

Modified: head/devel/quilt/pkg-plist
==============================================================================
--- head/devel/quilt/pkg-plist	Thu Jul  3 08:36:12 2014	(r360344)
+++ head/devel/quilt/pkg-plist	Thu Jul  3 09:13:35 2014	(r360345)
@@ -2,6 +2,8 @@ bin/guards
 bin/quilt
 etc/bash_completion.d/quilt
 etc/quilt.quiltrc
+man/man1/guards.1.gz
+man/man1/quilt.1.gz
 share/emacs/site-lisp/quilt.el
 %%NLS%%share/locale/de/LC_MESSAGES/quilt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/quilt.mo

Modified: head/misc/lesspipe/Makefile
==============================================================================
--- head/misc/lesspipe/Makefile	Thu Jul  3 08:36:12 2014	(r360344)
+++ head/misc/lesspipe/Makefile	Thu Jul  3 09:13:35 2014	(r360345)
@@ -3,6 +3,7 @@
 
 PORTNAME=	lesspipe
 PORTVERSION=	1.55
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
@@ -13,7 +14,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/b
 
 .if defined(WITH_FANCY)
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
-		rpm:${PORTSDIR}/archivers/rpm \
+		rpm:${PORTSDIR}/archivers/rpm4 \
 		dpkg:${PORTSDIR}/archivers/dpkg \
 		antiword:${PORTSDIR}/textproc/antiword \
 		lynx:${PORTSDIR}/www/lynx \

Modified: head/print/apsfilter/Makefile
==============================================================================
--- head/print/apsfilter/Makefile	Thu Jul  3 08:36:12 2014	(r360344)
+++ head/print/apsfilter/Makefile	Thu Jul  3 09:13:35 2014	(r360345)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.8
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 DIST_SUBDIR=	apsfilter
@@ -88,7 +88,7 @@ _DEPENDS_COMPRESS= \
 		cabextract:${PORTSDIR}/archivers/cabextract \
 		lha:${PORTSDIR}/archivers/lha \
 		rar:${PORTSDIR}/archivers/rar \
-		rpm:${PORTSDIR}/archivers/rpm \
+		rpm:${PORTSDIR}/archivers/rpm4 \
 		unarj:${PORTSDIR}/archivers/unarj \
 		unzip:${PORTSDIR}/archivers/unzip \
 		zoo:${PORTSDIR}/archivers/zoo