Although I think my checking-for-previous-glib20-versions code was pretty 1337,

Joe is right that it'll break more installations than it'll save.

So, instead, there's now a pre-configure message.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2023 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 11 insertions, 14 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 1a6c74c05..3823e1bd6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -39,19 +39,16 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 pre-everything::
-	@have_glib=`${LS} ${PKG_DBDIR} | ${GREP} '^glib-2\.' | ${CUT} -f 1,2 -d'.'` ; \
-	if [ ! -z "$${have_glib}" -a "$${have_glib}" != "glib-2.3" ]; then \
-		if [ "x${GNOME_UPGRADE_SH_VER}" = "x" -a "x${FORCE_MANUAL_UPGRADE}" = "x" ]; then \
-			${ECHO_CMD}; \
-			${ECHO_CMD} "You are attempting to perform a GNOME upgrade manually.  Unless you know"; \
-			${ECHO_CMD} "what you're doing, you probably do not want to do that."; \
-			${ECHO_CMD}; \
-			${ECHO_CMD} "You are strongly urged to upgrade GNOME according to the steps outlined in:"; \
-			${ECHO_CMD} "	http://www.freebsd.org/gnome/develfaq.html"; \
-			${ECHO_CMD}; \
-			${ECHO_CMD} "If you wish to to continue with this upgrade manually,"; \
-			${ECHO_CMD} "define FORCE_MANUAL_UPGRADE."; \
-			${ECHO_CMD}; \
-			exit 1; fi; fi
+	@${ECHO_CMD} '******************************************'
+	@${ECHO_CMD}
+	@${ECHO_CMD} If you have not updated your GNOME ports in the manner outlined in
+	@${ECHO_CMD} 	http://www.freebsd.org/gnome/develfaq.html
+	@${ECHO_CMD} then you should abort this build immediately and follow the directions
+	@${ECHO_CMD} outlined in that document.
+	@${ECHO_CMD}
+	@${ECHO_CMD} Failure to follow the above directions will result in everything
+	@${ECHO_CMD} GNOME-related breaking.
+	@${ECHO_CMD}
+	@${ECHO_CMD} '******************************************'
 
 .include <bsd.port.mk>