Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Feb 2016 20:06:21 +0000 (UTC)
From:      Alex Kozlov <ak@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408590 - head/archivers/rpm2cpio
Message-ID:  <201602092006.u19K6LQY045520@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ak
Date: Tue Feb  9 20:06:21 2016
New Revision: 408590
URL: https://svnweb.freebsd.org/changeset/ports/408590

Log:
  - Simplify port
  - Add license
  - Install also as rpm2cpio, therefore add CONFLICTS_INSTALL with rpm4 [1]
  
  Proded by:	koobs [1]

Modified:
  head/archivers/rpm2cpio/Makefile

Modified: head/archivers/rpm2cpio/Makefile
==============================================================================
--- head/archivers/rpm2cpio/Makefile	Tue Feb  9 18:34:04 2016	(r408589)
+++ head/archivers/rpm2cpio/Makefile	Tue Feb  9 20:06:21 2016	(r408590)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpm2cpio
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -11,19 +11,19 @@ DISTFILES=	# none
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Convert .rpm files to cpio format
 
-NO_WRKSUBDIR=	yes
+LICENSE=	BSD2CLAUSE
+
+CONFLICTS_INSTALL=	rpm4-*
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-PLIST_FILES=	bin/rpm2cpio.pl
-
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@${CP} ${FILESDIR}/${PORTNAME} ${WRKSRC}/${PORTNAME}
+PLIST_FILES=	bin/rpm2cpio.pl \
+		bin/rpm2cpio
 
 do-install:
-# Installed as rpm2cpio.pl to not break existing scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.pl
+	${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+# Also install as rpm2cpio.pl to not break existing scripts
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.pl
 
 .include <bsd.port.mk>



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