svn commit: r382279 - head/x11-toolkits/linux-c6-tk85

[Matthias Andree]

Author: mandree
Date: Wed Mar 25 23:57:31 2015
New Revision: 382279
URL: https://svnweb.freebsd.org/changeset/ports/382279
QAT: https://qat.redports.org/buildarchive/r382279/

Log:
  Fix build as unprivileged user.
  Add rpm4 as extract requisite, and use rpm2archive to get something that
  yields non-zero-sized manual pages.
  While here, clean up pkg-plist a bit.
  Bump PORTREVISION.
  
  PR:		196414
  Submitted by:	peterj
  Reviewed by:	xmj
  Approved by:	emulation (eadler)

Modified:
  head/x11-toolkits/linux-c6-tk85/Makefile
  head/x11-toolkits/linux-c6-tk85/pkg-plist

Modified: head/x11-toolkits/linux-c6-tk85/Makefile
==============================================================================
--- head/x11-toolkits/linux-c6-tk85/Makefile	Wed Mar 25 23:51:05 2015	(r382278)
+++ head/x11-toolkits/linux-c6-tk85/Makefile	Wed Mar 25 23:57:31 2015	(r382279)
@@ -3,13 +3,15 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.5.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 PKGNAMESUFFIX=	85
 
 MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
 
+EXTRACT_DEPENDS=rpm2archive:${PORTSDIR}/archivers/rpm4
+
 CONFLICTS=	linux-f10-tk85-[0-9]*
 
 USE_LINUX=	c6
@@ -17,10 +19,13 @@ USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	xorglibs
 
 RPMVERSION=	5.el6
-BRANELF_FILES=	#usr/bin/wish8.5
+BRANDELF_FILES=	#usr/bin/wish8.5
 USE_LDCONFIG=	yes
 
-DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
+EXTRACT_CMD=	${LOCALBASE}/bin/rpm2archive
+EXTRACT_BEFORE_ARGS=	<
+EXTRACT_AFTER_ARGS=	| ${GZIP_CMD} -cd | ${TAR} xf - --no-same-owner --no-same-permissions
 
+DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/linux-c6-tk85/pkg-plist
==============================================================================
--- head/x11-toolkits/linux-c6-tk85/pkg-plist	Wed Mar 25 23:51:05 2015	(r382278)
+++ head/x11-toolkits/linux-c6-tk85/pkg-plist	Wed Mar 25 23:57:31 2015	(r382279)
@@ -258,19 +258,3 @@ usr/%%DATADIR%%8.5/ttk/winTheme.tcl
 usr/%%DATADIR%%8.5/ttk/xpTheme.tcl
 usr/%%DATADIR%%8.5/unsupported.tcl
 usr/%%DATADIR%%8.5/xmfbox.tcl
- at dirrmtry usr/%%DATADIR%%8.5/ttk
- at dirrmtry usr/%%DATADIR%%8.5/msgs
- at dirrmtry usr/%%DATADIR%%8.5/images
- at dirrmtry usr/%%DATADIR%%8.5/demos/images
- at dirrmtry usr/%%DATADIR%%8.5/demos
- at dirrmtry usr/%%DATADIR%%8.5
- at dirrmtry usr/share/man/mann
- at dirrmtry usr/share/man/man1
- at dirrmtry usr/share/man
- at dirrmtry usr/share/doc/tk-8.5.7
- at dirrmtry usr/share/doc
- at dirrmtry usr/share
- at dirrmtry usr/lib/tk8.5
- at dirrmtry usr/lib
- at dirrmtry usr/bin
- at dirrmtry usr