svn commit: r321003 - in head/emulators/i386-wine-devel: . files

[David Naylor]

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 at 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"