Index: head/archivers/rpm2cpio/Makefile
===================================================================
--- head/archivers/rpm2cpio/Makefile	(revision 408589)
+++ head/archivers/rpm2cpio/Makefile	(revision 408590)
@@ -1,29 +1,29 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 # $FreeBSD$
 
 PORTNAME=	rpm2cpio
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	# none
 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
+PLIST_FILES=	bin/rpm2cpio.pl \
+		bin/rpm2cpio
 
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	@${CP} ${FILESDIR}/${PORTNAME} ${WRKSRC}/${PORTNAME}
-
 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>