PERFORCE change 95109 for review

[soc-andrew]

http://perforce.freebsd.org/chv.cgi?CH=95109

Change 95109 by soc-andrew at soc-andrew_serv on 2006/04/12 23:21:45

	Use the net/luasocket and devel/lua50-posix (PR 94987) packages rather than the local version

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#41 edit
.. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#9 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#41 (text+ko) ====

@@ -340,6 +340,9 @@
 CVS_PORTSARGS+=	-r ${PORTSRELEASETAG}
 .endif
 
+PACKAGE_SITE?=	ftp://ftp.freebsd.org
+PACKAGE_DIR?=	pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest
+
 WORLDDIR?=	${.CURDIR}/..
 
 release rerelease:
@@ -495,6 +498,8 @@
 	NO_CPU_CFLAGS \
 	NO_CPU_COPTFLAGS \
 	NO_FLOPPIES \
+	PACKAGE_DIR \
+	PACKAGE_SITE \
 	RELEASETAG \
 	RELNOTES_LANG \
 	SEPARATE_LIVEFS \
@@ -821,11 +826,24 @@
 	@cp -Rp ${RD}/kernels/GENERIC/ ${RD}/bsdinstaller/root/boot/kernel
 
 	# Install Lua into the package root
-	# XXX Make the ftp site changeable
 	( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua.tbz \
-		ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHINE_ARCH}/packages-7-current/Latest/lua.tbz && \
-		pkg_add -R -P ${RD}/bsdinstaller/root/usr/local ${RD}/bsdinstaller/lua.tbz )
+		${PACKAGE_SITE}/${PACKAGE_DIR}/lua.tbz && \
+		pkg_add -R -P ${RD}/bsdinstaller/root/usr/local \
+		${RD}/bsdinstaller/lua.tbz )
 	rm ${RD}/bsdinstaller/lua.tbz
+
+	( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/luasocket.tbz \
+		${PACKAGE_SITE}/${PACKAGE_DIR}/luasocket.tbz && \
+		pkg_add -R -P ${RD}/bsdinstaller/root/usr/local \
+		${RD}/bsdinstaller/luasocket.tbz )
+	rm ${RD}/bsdinstaller/luasocket.tbz
+
+	( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/lua50-posix-5.0.tbz \
+		${PACKAGE_SITE}/${PACKAGE_DIR}/lua50-posix-5.0.tbz && \
+		pkg_add -R -P ${RD}/bsdinstaller/root/usr/local \
+		${RD}/bsdinstaller/lua50-posix-5.0.tbz )
+	rm ${RD}/bsdinstaller/lua50-posix-5.0.tbz
+	
 	# Reset the library directories
 	ldconfig /lib /usr/lib /usr/lib/compat /usr/local/lib
 

==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#9 (text+ko) ====

@@ -13,7 +13,7 @@
   /usr/sbin/bsd_installer_ncurses
 elif [ ${TTY} = "/dev/ttyv1" ]
 then
-   LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so" LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true
+   LD_PRELOAD="/usr/local/lib/liblua.so;/usr/local/lib/liblualib.so;/usr/lib/libm.so" LUA_PATH="/usr/local/share/lua/5.0/?.lua;/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH="/usr/local/lib/lua/5.0/?.so;/usr/lib/lua/?.so" LUA_SOPATH=/usr/local/lib/lua/5.0/ lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true
   #/usr/sbin/bsd_installer_be
   if [ $? -eq 5 ]
   then