Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Sep 2014 14:08:10 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368564 - head/archivers/rpm4
Message-ID:  <201409191408.s8JE8AJ2041116@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Fri Sep 19 14:08:10 2014
New Revision: 368564
URL: http://svnweb.freebsd.org/changeset/ports/368564
QAT: https://qat.redports.org/buildarchive/r368564/

Log:
  - Use archivers/libarchive for FreeBSD < 10
  - Bump portrevision
  
  Submitted by:	John Hein <john.hein@microsemi.com>

Modified:
  head/archivers/rpm4/Makefile

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Fri Sep 19 14:01:08 2014	(r368563)
+++ head/archivers/rpm4/Makefile	Fri Sep 19 14:08:10 2014	(r368564)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.12.0.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/
@@ -58,6 +59,12 @@ CONFIGURE_ENV+=	LUA_CFLAGS=-I${LUA_INCDI
 		LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000
+LIB_DEPENDS+=	libarchive.so:${PORTSDIR}/archivers/libarchive
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
@@ -70,4 +77,4 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409191408.s8JE8AJ2041116>