Ignore PATCHES if source/ exists.

2 files changed, 13 insertions, 13 deletions

diff --git a/libexec/build-make-prep b/libexec/build-make-prep
index 732c7cf..3b8648d 100755
--- a/libexec/build-make-prep
+++ b/libexec/build-make-prep
@@ -35,7 +35,7 @@ build_make_prep()
 	PKG_LOGFILE="${L}/prep.log"
 
 	SOURCE_DIR="${BUILDER_PKGDIR}/${CATEGORY}/${NAME}/source"
-	if [ -d "${SOURCE_DIR}" -o -L "${SOURCE_DIR}" ]; then
+	if test -e "${SOURCE_DIR}"; then
 		echo "prepping ${1} from source: '${SOURCE_DIR}"
 		if [ "$(command -v rsync)" ]; then
 			if ! rsync -rav --delete "${SOURCE_DIR}/" "${S}"; then
@@ -77,8 +77,8 @@ build_make_prep()
 	cd "${W}"
 	pkg_prep >> "${PKG_LOGFILE}" 2>&1
 
-	# FIXME wrap up the patch command with something more functional
-	if [ ! -z "${PATCHES}" ]; then
+	# FIXME wrap up the patch command with something more functional..
+	if ! test -z "${PATCHES}" && ! test -e "${SOURCE_DIR}"; then
 		for patch in ${PATCHES}; do
 			echo "${NAME}: applying patch '${patch}'" | tee -a "${PKG_LOGFILE}"
 			if ! patch -l -t -d "${S}" -p1 < "${F}/${NAME}-${VERSION}-${patch}.patch"; then
diff --git a/libexec/build-makedeps b/libexec/build-makedeps
index ce9a28b..e9968a0 100755
--- a/libexec/build-makedeps
+++ b/libexec/build-makedeps
@@ -131,16 +131,6 @@ for package; do
 	done
 	unset file
 
-	# Depend on all listed patches
-	for patch in ${PATCHES}; do
-		patch="${F}/${NAME}-${VERSION}-${patch}.patch"
-		if ! test -f "${patch}"; then
-			die "patch does not exist '${patch}'"
-		fi
-		echo "${makedep_prep}: ${patch}"
-	done
-	unset patch
-
 
 	# FIXME there can be strange characters in a URI .. this might not be
 	# the best approach in the long term.
@@ -167,6 +157,16 @@ for package; do
 		printf "${makedep_prep}: ${makedep_target}_fetch\n\t@build-make-prep '${package}'\n"
 		printf "${makedep_target}_fetch:\n\t@rm -f ${makedep_prep}\n"
 	else
+		# Depend on all listed patches
+		for patch in ${PATCHES}; do
+			patch="${F}/${NAME}-${VERSION}-${patch}.patch"
+			if ! test -f "${patch}"; then
+				die "patch does not exist '${patch}'"
+			fi
+			echo "${makedep_prep}: ${patch}"
+		done
+		unset patch
+
 		printf "${makedep_source}: ${PACKAGE_SOURCES}\n\t@build-make-source '${package}'\n"
 		printf "${makedep_prep}: ${PACKAGE_SOURCES}\n\t@build-make-prep '${package}'\n"
 		printf "all_fetch all_all_fetch ${makedep_target}_fetch: ${PACKAGE_SOURCES}\n"