From owner-svn-ports-all@freebsd.org  Tue Feb  9 20:06:22 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 746EBAA2BFB;
 Tue,  9 Feb 2016 20:06:22 +0000 (UTC) (envelope-from ak@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 41F92144C;
 Tue,  9 Feb 2016 20:06:22 +0000 (UTC) (envelope-from ak@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u19K6Ldi045521;
 Tue, 9 Feb 2016 20:06:21 GMT (envelope-from ak@FreeBSD.org)
Received: (from ak@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u19K6LQY045520;
 Tue, 9 Feb 2016 20:06:21 GMT (envelope-from ak@FreeBSD.org)
Message-Id: <201602092006.u19K6LQY045520@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org
 using -f
From: Alex Kozlov <ak@FreeBSD.org>
Date: Tue, 9 Feb 2016 20:06:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408590 - head/archivers/rpm2cpio
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Feb 2016 20:06:22 -0000

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>