diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2002-05-18 21:39:08 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2002-05-18 21:39:08 +0000 |
| commit | 4f87b1161ce48f6daed9a06970e4df8e47ba9035 (patch) | |
| tree | 36283f6ba2fc00f7896436828fec5403bac5817c /databases/grass-i18n/files | |
| parent | Add dbdesigner preview 2, a visual database design tool. Usable already (diff) | |
Unbreak and upgrade to 5.0.0.pre4.
Prodded by: kris, Jason Morgan <jwm-freebsd@sentinelchicken.net>
Diffstat (limited to 'databases/grass-i18n/files')
| -rw-r--r-- | databases/grass-i18n/files/patch-Makefile.in | 10 | ||||
| -rw-r--r-- | databases/grass-i18n/files/patch-configure.in | 13 |
2 files changed, 5 insertions, 18 deletions
diff --git a/databases/grass-i18n/files/patch-Makefile.in b/databases/grass-i18n/files/patch-Makefile.in index a1cb8714f6e3..93630def4d43 100644 --- a/databases/grass-i18n/files/patch-Makefile.in +++ b/databases/grass-i18n/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Feb 12 11:38:08 2002 -+++ Makefile.in Tue Feb 12 12:11:45 2002 -@@ -170,8 +170,6 @@ +--- Makefile.in.orig Mon May 13 09:41:58 2002 ++++ Makefile.in Sat May 18 21:23:45 2002 +@@ -172,8 +172,6 @@ test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR} ${SHELL} -c "sed -e \"s#^GISBASE.*#GISBASE=${INST_DIR}#\" ${GRASS_BIN}/grass${NAME_VER} > ${BINDIR}/grass${NAME_VER} ; true" ${SHELL} -c "chmod a+x ${BINDIR}/grass${NAME_VER} ; true" @@ -9,12 +9,12 @@ ${SHELL} -c "cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true" ${SHELL} -c "cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true" ${SHELL} -c "cd ${GISBASE} ; tar cBf - documents | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true" -@@ -196,6 +194,8 @@ +@@ -199,6 +197,8 @@ fi ${SHELL} -c "sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/monitorcap > ${INST_DIR}/etc/monitorcap ; true" ${SHELL} -c "chmod -R 1777 ${INST_DIR}/locks 2>/dev/null ; true" + ${SHELL} -c "sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/paint/driver.rsh > ${INST_DIR}/etc/paint/driver.rsh ; true" + ${SHELL} -c "chmod 755 ${INST_DIR}/etc/paint/driver.rsh ; true" + ${SHELL} -c "chmod -R a+rX ${INST_DIR} 2>/dev/null ; true" uninstall: FORCE - @ # NOTE: if anything is changed for uninstall then the same change diff --git a/databases/grass-i18n/files/patch-configure.in b/databases/grass-i18n/files/patch-configure.in index c3571ebfefda..505cfdb7b74b 100644 --- a/databases/grass-i18n/files/patch-configure.in +++ b/databases/grass-i18n/files/patch-configure.in @@ -9,19 +9,6 @@ if test -n "$with_libs"; then for dir in $with_libs; do -@@ -392,9 +392,9 @@ - ])]) - AC_SUBST(DLLIB) - --AC_CHECK_FUNC(iconv, ICONVLIB=, [ --AC_CHECK_LIB(giconv, iconv, ICONVLIB=-lgiconv, [ -- AC_MSG_WARN([*** Unable to locate iconv() function.]) -+AC_CHECK_FUNC(libiconv, ICONVLIB=, [ -+AC_CHECK_LIB(giconv, libiconv, ICONVLIB=-lgiconv, [ -+ AC_MSG_WARN([*** Unable to locate libiconv() function.]) - ICONVLIB= - ])]) - AC_SUBST(ICONVLIB) @@ -439,7 +439,7 @@ LOC_CHECK_INC_PATH(dbm,DBM,DBMINCPATH) |