2 files changed, 104 insertions, 104 deletions
diff --git a/java/eclipse/scripts/configure b/java/eclipse/scripts/configure
deleted file mode 100644
index efe9aa66ca51..000000000000
--- a/java/eclipse/scripts/configure
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-copy_dir()
-{
-	srcdir=$1
-	dstdir=$2
-
-
-	rm -rf "$dstdir"
-	cp -r "$srcdir" "$dstdir" || exit 1
-
-	if [ -d "$dstdir" ]
-	then
-		find "$dstdir" -name \*.so -delete
-		find "$dstdir" -name \*.so.\* -delete
-		find "$dstdir" -type f -print0 | \
-		xargs -0 sed -i '.bak'  's/linux/freebsd/g; s/Linux/FreeBSD/g'
-		find "$dstdir" -name \*.bak -delete 
-	fi 
-}
-
-configure()
-{
-	# Copy the files and rename/change them appropriately
-	for src in $COPY_LIST
-	do
-		dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'`
-		echo Copying $src into $dst
-		copy_dir ${WRKSRC}/$src ${WRKSRC}/$dst
-	done
-
-	# Determine the toolkit we must use
-	if [ "${ECLIPSE_WS}" = "motif" ]; then
-		ln -sf "${SWTMOTIF}" ${SWTSHORT}   || exit 1
-		ln -sf "${SWTMOTIFGTK}"/* ${SWTSHORT} || exit 1
-	else
-		ln -sf "${SWTGTK}" ${SWTSHORT}   || exit 1
-	fi
-	ln -sf "${SWTCOMMON}"/* ${SWTSHORT} || exit 1
-	ln -sf "${SWTAWT}"/* ${SWTSHORT} || exit 1
-	ln -sf "${SWTMOZ}"/* ${SWTSHORT} || exit 1
-	ln -sf "${SWTPROG}"/* ${SWTSHORT} || exit 1
-
-
-	# Use our own files to drive the build
-	cp ${FILESDIR}/Makefile ${WRKSRC} || exit 1
-	cp ${FILESDIR}/assemble.org.eclipse.sdk.freebsd.gtk.x86.xml ${WRKSRC} \
-		|| exit 1
-	cp ${FILESDIR}/assemble.org.eclipse.sdk.freebsd.motif.x86.xml ${WRKSRC} \
-		|| exit 1
-
-	# Copy a schell script template
-	cp ${FILESDIR}/eclipse.in ${WRKSRC} || exit 1
-
-	# Avoid the spaces-in-path patching problem by copying directly
-	cp ${FILESDIR}/make_gtk.mak "${SWTGTK}" || exit 1
-	cp ${FILESDIR}/make_gtk.xml "${SWTGTK}" || exit 1
-	cp ${FILESDIR}/build.sh "${SWTGTK}" || exit 1
-	cp ${FILESDIR}/make_freebsd.mak "${SWTMOTIF}" || exit 1
-	cp ${FILESDIR}/make_motif.xml "${SWTMOTIF}" || exit 1
-	cp ${FILESDIR}/swt-motif-build.sh "${SWTMOTIF}/build.sh" || exit 1
-
-	# Avoid a patching problem by copying directly
-	cp ${FILESDIR}/update-build.xml "${WRKSRC}/plugins/org.eclipse.update.core.freebsd/src/build.xml" || exit 1
-
-	find ${WRKSRC} -name \*.so -delete
-	find ${WRKSRC} -name \*.so.\* -delete
-}
-
-COPY_LIST="
-plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties
-plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties
-plugins/platform-launcher/library/motif/make_linux.mak
-assemble.org.eclipse.sdk.linux.motif.x86.xml
-assemble.org.eclipse.sdk.linux.gtk.x86.xml
-
-plugins/org.eclipse.pde.source.linux.gtk.x86
-plugins/org.eclipse.pde.source.linux.motif.x86
-plugins/org.eclipse.platform.source.linux.motif.x86
-plugins/org.eclipse.swt.motif/os/linux
-plugins/org.eclipse.jdt.source.linux.motif.x86
-plugins/org.eclipse.platform.source.linux.gtk.x86
-plugins/org.eclipse.jdt.source.linux.gtk.x86
-plugins/org.eclipse.update.core.linux
-plugins/org.eclipse.update.core.linux/os/linux
-plugins/org.eclipse.core.resources.linux
-plugins/org.eclipse.core.resources.linux/os/linux
-plugins/org.eclipse.swt.gtk/os/linux
-plugins/platform-launcher/bin/linux
-features/org.eclipse.platform/linux.motif
-"
-
-SWTGTK="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-SWTMOTIF="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
-SWTMOTIFGTK="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library"
-SWTCOMMON="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT/common/library"
-SWTAWT="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT AWT/gtk/library"
-SWTMOZ="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library"
-SWTPROG="${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library"
-SWTSHORT="${WRKSRC}/plugins/org.eclipse.swt/Eclipse_SWT"
-
-configure
-exit 0
diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch
new file mode 100644
index 000000000000..fdc249b6a75d
--- /dev/null
+++ b/java/eclipse/scripts/pre-patch
@@ -0,0 +1,104 @@
+#!/bin/sh
+# $FreeBSD$
+
+copy_file()
+{
+	srcfile="$1"
+	dstfile="$2"
+
+	rm -f $dstfile
+	cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile"
+}
+
+copy_dir()
+{
+	srcdir="$1"
+	dstdir="$2"
+
+	rm -rf "$dstdir"
+	cp -r "$srcdir" "$dstdir" || exit 1
+
+	if [ -d "$dstdir" ]
+	then
+		find "$dstdir" -name \*.so -delete
+		find "$dstdir" -name \*.so.\* -delete
+		find "$dstdir" -type f -print0 | \
+		xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'
+		find "$dstdir" -name \*.bak -delete 
+	fi 
+}
+
+prepare_files()
+{
+	mkdir ${WRKSRC}/features/org.eclipse.platform.launchers/bin/gtk/freebsd
+
+	# Copy the files and rename/change them appropriately
+	for src in $COPY_LIST
+	do
+		dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'`
+		echo Copying $src into $dst
+		if [ -d ${WRKSRC}/$src ]
+		then
+			copy_dir ${WRKSRC}/$src ${WRKSRC}/$dst
+		else
+			copy_file ${WRKSRC}/$src ${WRKSRC}/$dst
+		fi
+	done
+
+	# Files with spaces in their path...
+	src="${SWTGTK}/make_linux.mak"
+	dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'`
+	echo Copying $src into $dst
+	copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst"
+
+	src="${SWTMOTIF}/make_linux.mak"
+	dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'`
+	echo Copying $src into $dst
+	copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst"
+
+	find ${WRKSRC} -name \*.so -delete
+	find ${WRKSRC} -name \*.so.\* -delete
+}
+
+COPY_LIST="
+assemble.org.eclipse.sdk.linux.gtk.x86.xml
+assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+assemble.org.eclipse.sdk.linux.motif.x86.xml
+features/org.eclipse.platform/about_files/linux.gtk.x86
+features/org.eclipse.platform/about_files/linux.gtk.x86_64
+features/org.eclipse.platform/about_files/linux.motif.x86
+features/org.eclipse.platform.launchers/bin/gtk/linux/x86
+features/org.eclipse.platform.launchers/bin/gtk/linux/x86_64
+features/org.eclipse.platform.launchers/bin/motif/linux
+features/org.eclipse.platform.launchers/library/gtk/make_linux.mak
+features/org.eclipse.platform.launchers/library/motif/make_linux.mak
+plugins/org.eclipse.core.resources.linux
+plugins/org.eclipse.core.resources.linux/os/linux
+plugins/org.eclipse.core.resources.linux/os/linux/x86
+plugins/org.eclipse.core.resources.linux/os/linux/x86_64
+plugins/org.eclipse.jdt.source.linux.gtk.x86
+plugins/org.eclipse.jdt.source.linux.gtk.x86_64
+plugins/org.eclipse.jdt.source.linux.motif.x86
+plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties
+plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties
+plugins/org.eclipse.pde.source.linux.gtk.x86
+plugins/org.eclipse.pde.source.linux.gtk.x86_64
+plugins/org.eclipse.pde.source.linux.motif.x86
+plugins/org.eclipse.platform.source.linux.gtk.x86
+plugins/org.eclipse.platform.source.linux.gtk.x86_64
+plugins/org.eclipse.platform.source.linux.motif.x86
+plugins/org.eclipse.rcp.source.linux.gtk.x86
+plugins/org.eclipse.rcp.source.linux.gtk.x86_64
+plugins/org.eclipse.rcp.source.linux.motif.x86
+plugins/org.eclipse.swt.gtk.linux.x86
+plugins/org.eclipse.swt.gtk.linux.x86_64
+plugins/org.eclipse.swt.motif.linux.x86
+plugins/org.eclipse.update.core.linux
+plugins/org.eclipse.update.core.linux/os/linux
+"
+
+SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+SWTMOTIF="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
+
+prepare_files
+exit 0