diff options
| author | dbn <dbn@FreeBSD.org> | 2013-06-15 22:26:27 +0800 |
|---|---|---|
| committer | dbn <dbn@FreeBSD.org> | 2013-06-15 22:26:27 +0800 |
| commit | ee8b94394650c5d412efec738939de1c527063df (patch) | |
| tree | 35edab1f50a933f1514190637d85bb53be169d13 /emulators | |
| parent | d005ed591305c74441a3ec7156d40a9340242d19 (diff) | |
| download | freebsd-ports-gnome-ee8b94394650c5d412efec738939de1c527063df.tar.gz freebsd-ports-gnome-ee8b94394650c5d412efec738939de1c527063df.tar.zst freebsd-ports-gnome-ee8b94394650c5d412efec738939de1c527063df.zip | |
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>
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/i386-wine-devel/Makefile | 4 | ||||
| -rw-r--r-- | emulators/i386-wine-devel/files/nvidia.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/emulators/i386-wine-devel/Makefile b/emulators/i386-wine-devel/Makefile index 0ef51ff3a5b6..44e343171145 100644 --- a/emulators/i386-wine-devel/Makefile +++ b/emulators/i386-wine-devel/Makefile @@ -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' ' | \ diff --git a/emulators/i386-wine-devel/files/nvidia.sh b/emulators/i386-wine-devel/files/nvidia.sh index d1808f8f84f6..c930f25c607d 100644 --- a/emulators/i386-wine-devel/files/nvidia.sh +++ b/emulators/i386-wine-devel/files/nvidia.sh @@ -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" |