From owner-svn-ports-all@FreeBSD.ORG  Sat Jun 15 14:26:28 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3A270C2D;
 Sat, 15 Jun 2013 14:26:28 +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 11EA319B2;
 Sat, 15 Jun 2013 14:26:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FEQRfO004954;
 Sat, 15 Jun 2013 14:26:27 GMT (envelope-from dbn@svn.freebsd.org)
Received: (from dbn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FEQRQD004952;
 Sat, 15 Jun 2013 14:26:27 GMT (envelope-from dbn@svn.freebsd.org)
Message-Id: <201306151426.r5FEQRQD004952@svn.freebsd.org>
From: David Naylor <dbn@FreeBSD.org>
Date: Sat, 15 Jun 2013 14:26:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321003 - in head/emulators/i386-wine-devel: . files
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jun 2013 14:26:28 -0000

Author: dbn
Date: Sat Jun 15 14:26:27 2013
New Revision: 321003
URL: http://svnweb.freebsd.org/changeset/ports/321003

Log:
  Fix plist and directory creation for emulators/i386-wine-devel.
  
  The dynamic plist removed some directories before the files in those directories
  were created, fix this.
  
  Use a UMASH of 0755 for directory creation (vs 0333).
  
  Approved by:	eadler,bdrewery (mentors, implicit)
  Pointed out by:	Jan Beich <jbeich@tormail.org>

Modified:
  head/emulators/i386-wine-devel/Makefile
  head/emulators/i386-wine-devel/files/nvidia.sh

Modified: head/emulators/i386-wine-devel/Makefile
==============================================================================
--- head/emulators/i386-wine-devel/Makefile	Sat Jun 15 14:23:06 2013	(r321002)
+++ head/emulators/i386-wine-devel/Makefile	Sat Jun 15 14:26:27 2013	(r321003)
@@ -32,8 +32,6 @@ post-install-script:
 		[ "$${i}" = "wine" ] || ${LN} -f ${PREFIX}/bin/wine ${PREFIX}/bin/$${i} ; \
 		echo bin32/$${i} >> ${TMPPLIST} ; \
 	done
-	echo '@dirrm lib32/.libGL/dri' >> ${TMPPLIST}
-	echo '@dirrm lib32/.libGL' >> ${TMPPLIST}
 	echo '@dirrm bin32' >> ${TMPPLIST}
 	# Install dri libraries (internal libGL requirements)
 	${MKDIR} ${PREFIX}/lib32/.libGL/dri
@@ -41,6 +39,8 @@ post-install-script:
 		${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' ' | \

Modified: head/emulators/i386-wine-devel/files/nvidia.sh
==============================================================================
--- head/emulators/i386-wine-devel/files/nvidia.sh	Sat Jun 15 14:23:06 2013	(r321002)
+++ head/emulators/i386-wine-devel/files/nvidia.sh	Sat Jun 15 14:26:27 2013	(r321003)
@@ -187,7 +187,7 @@ done
 umask 0333
 tar $EXTRACT_ARGS -xvf NVIDIA-FreeBSD-x86-${NV}.tar.gz \
   || terminate 3 "Failed to extract NVIDIA-FreeBSD-x86-${NV}.tar.gz"
-mkdir -p ${PREFIX}/lib32/.nvidia \
+mkdir -m 0755 -p ${PREFIX}/lib32/.nvidia \
   || terminate 9 "Failed to create .nvidia shadow directory"
 mv ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/.nvidia/ \
   || terminate 10 "Failed to move libGL.so.1 to .nvidia/ shadow directory"