diff options
author | Vasil Dimov <vd@FreeBSD.org> | 2007-03-28 20:46:18 +0000 |
---|---|---|
committer | Vasil Dimov <vd@FreeBSD.org> | 2007-03-28 20:46:18 +0000 |
commit | 77f70244fc6825d72de1a6017266efdcdcdbe5f0 (patch) | |
tree | f0f05adfd449463f87a5c2a09d9ce8f270446f59 /graphics/hugin | |
parent | - Update to 2007.03.27 (diff) |
Allow the execution of gettextize because the present gettext infrastructure
does not work with the new gettext version.
Unfortunately gettextize is interactive (it just wants one to hit enter)
and there seems no way to circumvent this, so I set IS_INTERACTIVE=yes
(it does ``read dummy < /dev/tty''!)
Diffstat (limited to 'graphics/hugin')
-rw-r--r-- | graphics/hugin/Makefile | 2 | ||||
-rw-r--r-- | graphics/hugin/files/patch-bootstrap | 50 |
2 files changed, 3 insertions, 49 deletions
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index d0af4a18927d..926f89356c3a 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -30,6 +30,8 @@ USE_BZIP2= yes USE_AUTOTOOLS= autoconf:259:env autoheader:259:env aclocal:19:env \ automake:19:env libtool:15:env +IS_INTERACTIVE= yes + GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WXRC=${WXRC_CMD} diff --git a/graphics/hugin/files/patch-bootstrap b/graphics/hugin/files/patch-bootstrap index 62dfccb4bf08..0370ac347c3c 100644 --- a/graphics/hugin/files/patch-bootstrap +++ b/graphics/hugin/files/patch-bootstrap @@ -1,5 +1,5 @@ --- bootstrap.orig Mon Aug 21 01:19:33 2006 -+++ bootstrap Thu Mar 22 12:59:45 2007 ++++ bootstrap Wed Mar 28 22:25:54 2007 @@ -42,7 +42,7 @@ gettextize_version=`$GETTEXTIZE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo gettextize version: $gettextize_version @@ -9,51 +9,3 @@ have_gettextize=true ;; esac -@@ -106,15 +106,17 @@ - mkdir -p ./config - fi - --echo --echo "*** WARNING ***" --echo "*** We're about to run \"gettextize\" which may spew a few paragraphs" --echo "*** at you and ask you to acknowledge it. If it does this," --echo "*** just hit return to acknowledge gettext. You DO NOT need to do" --echo "*** anything that it asks of you except hitting return." --echo -- --$GETTEXTIZE --copy --force || exit $? -+# we do not run gettextize since it is interactive and it seems that it -+# is not mandatory - the gettext infrastructure is already present -+#echo -+#echo "*** WARNING ***" -+#echo "*** We're about to run \"gettextize\" which may spew a few paragraphs" -+#echo "*** at you and ask you to acknowledge it. If it does this," -+#echo "*** just hit return to acknowledge gettext. You DO NOT need to do" -+#echo "*** anything that it asks of you except hitting return." -+#echo -+# -+#$GETTEXTIZE --copy --force || exit $? - - # Now we have to do a bit of hackery to setup for hugin - # first reverse the changes to configure.ac etc. -@@ -130,14 +132,14 @@ - - # then copy and move changes in srcdir/po to srcdir/src/hugin/po and srcdir/src/nona_gui/po - # but be careful about POTFILES.in --rm -f ./po/POTFILES.in --cp -f ./po/* ./src/hugin/po --mv -f ./po/* ./src/nona_gui/po -+#rm -f ./po/POTFILES.in -+#cp -f ./po/* ./src/hugin/po -+#mv -f ./po/* ./src/nona_gui/po - - #finally clean up --rm -rf `find ./src/hugin/po ./src/nona_gui/po ./m4 -name *~` --rm -rf ./m4/Makefile.am --rm -rf ./m4/Makefile.in -+#rm -rf `find ./src/hugin/po ./src/nona_gui/po ./m4 -name *~` -+#rm -rf ./m4/Makefile.am -+#rm -rf ./m4/Makefile.in - - $ACLOCAL -I m4 || exit $? - |