From owner-svn-ports-head@FreeBSD.ORG  Mon Jun 17 13:09:21 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3600BC98;
 Mon, 17 Jun 2013 13:09:21 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0ECEF15D0;
 Mon, 17 Jun 2013 13:09:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HD9KAJ085986;
 Mon, 17 Jun 2013 13:09:20 GMT (envelope-from dbn@svn.freebsd.org)
Received: (from dbn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HD9KTl085985;
 Mon, 17 Jun 2013 13:09:20 GMT (envelope-from dbn@svn.freebsd.org)
Message-Id: <201306171309.r5HD9KTl085985@svn.freebsd.org>
From: David Naylor <dbn@FreeBSD.org>
Date: Mon, 17 Jun 2013 13:09:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321106 - head/emulators/i386-wine-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jun 2013 13:09:21 -0000

Author: dbn
Date: Mon Jun 17 13:09:20 2013
New Revision: 321106
URL: http://svnweb.freebsd.org/changeset/ports/321106

Log:
  Really fix dynamic pkg-plist for emulators/i386-wine-devel.
  
  To prevent this problem from happening again the @dirrm section
  was consolidated and moved to after the files are added.
  
  Approved by:	eadler,bdrewery (mentors, implicit)
  Reported by:	qat@redports.org, bdrewery

Modified:
  head/emulators/i386-wine-devel/Makefile

Modified: head/emulators/i386-wine-devel/Makefile
==============================================================================
--- head/emulators/i386-wine-devel/Makefile	Mon Jun 17 13:04:08 2013	(r321105)
+++ head/emulators/i386-wine-devel/Makefile	Mon Jun 17 13:09:20 2013	(r321106)
@@ -32,15 +32,12 @@ post-install-script:
 		[ "$${i}" = "wine" ] || ${LN} -f ${PREFIX}/bin/wine ${PREFIX}/bin/$${i} ; \
 		echo bin32/$${i} >> ${TMPPLIST} ; \
 	done
-	echo '@dirrm bin32' >> ${TMPPLIST}
 	# Install dri libraries (internal libGL requirements)
 	${MKDIR} ${PREFIX}/lib32/.libGL/dri
 	for i in ${LOCALBASE}/lib/dri/*.so; do \
 		${INSTALL_DATA} $${i} ${PREFIX}/lib32/.libGL/dri/ ; \
 		echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \
 	done
-	echo '@dirrm lib32/.libGL/dri' >> ${TMPPLIST}
-	echo '@dirrm lib32/.libGL' >> ${TMPPLIST}
 	# Find all libraries that are linked too (via ldd(1))
 	grep -v '[@%]' ${TMPPLIST} | sed "s!^!${PREFIX}/!g" | \
 	xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \
@@ -66,11 +63,14 @@ post-install-script:
 			echo lib32/$${i} >> ${TMPPLIST} ; \
 		fi ; \
 	done
+	echo '@dirrm lib32/.libGL/dri' >> ${TMPPLIST}
+	echo '@dirrm lib32/.libGL' >> ${TMPPLIST}
 	if [ -n "${WITH_PKGNG}" ]; then \
 		echo '@dirrmtry lib32' >> ${TMPPLIST}; \
 	else \
 		echo '@unexec rmdir %D/lib32 2>/dev/null || true' >> ${TMPPLIST}; \
 	fi
+	echo '@dirrm bin32' >> ${TMPPLIST}
 	# Install nvidia patching script
 	${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${DATADIR}/patch-nvidia.sh
 	echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST}