diff options
| author | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-03 03:43:44 +0800 |
|---|---|---|
| committer | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-03 03:43:44 +0800 |
| commit | 6f4c526edfc922225f04f51664690fcde8a6747a (patch) | |
| tree | 6ba923011b3e5c54894f05d608e0d16e73808e7c | |
| parent | d82ee4162e47180ed076dd27dd5539cbb84dbc67 (diff) | |
| download | marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.tar marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.tar.gz marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.tar.bz2 marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.tar.lz marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.tar.xz marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.tar.zst marcuscom-ports-6f4c526edfc922225f04f51664690fcde8a6747a.zip | |
Durrrrr. `ls /var/db/pkg` is a LOT faster than `pkg_info`...
Also, change the error message a bit. I still don't really like how
it looks, and it's probably best if a fresh set of eyes changes it.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1941 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index cec39e4fa..05daf1d58 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -39,13 +39,18 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_LIBS="${PTHREAD_LIBS}" pre-everything:: - @if [ `${PKG_INFO} | ${GREP} "^glib-2\." | ${CUT} -f 1,2 -d'.'` != glib-2.3 ]; then \ + @if [ `${LS} ${PKG_DBDIR} | ${GREP} "^glib-2\." | ${CUT} -f 1,2 -d'.'` != glib-2.5 ]; then \ if [ "x${GNOME_UPGRADE_SH_VER}" = "x" -a "x${FORCE_MANUAL_UPGRADE}" = "x" ]; then \ - ${ECHO_CMD} "You are attempting to perform a GNOME upgrade manually."; \ + ${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 .include <bsd.port.mk> |