Date: Tue, 23 Jan 2007 18:01:11 +0200 From: Vasil Dimov <vd@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: cartola@openit.com.br Subject: ports/108266: Update port: graphics/hugin from 0.5 to 0.6.1 Message-ID: <20070123160111.GA21270@qlovarnika.bg.datamax> Resent-Message-ID: <200701231610.l0NGAJi6080726@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108266
>Category: ports
>Synopsis: Update port: graphics/hugin from 0.5 to 0.6.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 23 16:10:19 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 6.2-STABLE amd64
>Organization:
N/A
>Environment:
>Description:
Update graphics/hugin from 0.5 to 0.6.1:
* Change dependency on libpano12 >= 2.8.4
* Hook dependencies on the autotools, we need to recreate the
autogenerated files because now we have changed the autotools source
config files (configure.ac etc.) with the hope that our changes will
be propagated upstream
A files/patch-bootstrap
R files/patch-configure
A files/patch-configure.ac
A files/patch-m4_ax_boost.m4
A files/patch-m4_ax_check_graphics.m4
A files/patch-m4_ax_check_panotools.m4
A files/patch-m4_fftw.m4
A files/patch-src_hugin_xrc_Makefile.am
The update in ports/108265 needs to be commited before (or at once with)
this one.
>How-To-Repeat:
>Fix:
--- hugin.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 1 Dec 2006 07:38:55 -0000 1.14
+++ Makefile 23 Jan 2007 15:49:19 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= hugin
-PORTVERSION= 0.5
+PORTVERSION= 0.6.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,8 +14,9 @@
MAINTAINER= cartola@openit.com.br
COMMENT= A GUI for Panorama Tools, to stitch panoramic images
-BUILD_DEPENDS= PTOptimizer:${PORTSDIR}/graphics/libpano12 \
- vigra-config:${PORTSDIR}/graphics/vigra
+BUILD_DEPENDS= libpano12>=2.8.4:${PORTSDIR}/graphics/libpano12 \
+ vigra-config:${PORTSDIR}/graphics/vigra \
+ zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
png:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
@@ -24,15 +25,23 @@
RUN_DEPENDS= PTOptimizer:${PORTSDIR}/graphics/libpano12 \
PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
+USE_BZIP2= yes
+
+USE_AUTOTOOLS= autoconf:259:env autoheader:259:env aclocal:19:env \
+ automake:19:env libtool:15:env
+
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WXRC=${WXRC_CMD}
+CONFIGURE_ARGS+= --with-boost=${LOCALBASE} \
+ --disable-desktop
USE_GMAKE= yes
USE_ICONV= yes
USE_WX= 2.6
WX_CONF_ARGS= absolute
+MAN1= fulla.1
+
DOCSDIR= ${PREFIX}/share/hugin/xrc/data
.if defined(WITHOUT_NLS)
@@ -43,8 +52,10 @@
PLIST_SUB+= NLS=""
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|-wxrc|-${WX_CONFIG:S/wx/wxrc/}|' \
- ${WRKSRC}/src/hugin/xrc/Makefile.in
+pre-configure:
+ cd ${WRKSRC} && \
+ ${SETENV} ${AUTOTOOLS_ENV} \
+ ACLOCAL="${ACLOCAL} -I ${LOCALBASE}/share/aclocal" \
+ ./bootstrap
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 30 Jan 2006 14:40:58 -0000 1.4
+++ distinfo 23 Jan 2007 15:49:19 -0000
@@ -1,3 +1,3 @@
-MD5 (hugin-0.5.tar.gz) = 18b38f5d6744831567b7fabfedb643fd
-SHA256 (hugin-0.5.tar.gz) = 28b49663ea52ff73b61453a6b397c99b704844d6147f316f961327532f9ca1fc
-SIZE (hugin-0.5.tar.gz) = 2264996
+MD5 (hugin-0.6.1.tar.bz2) = 46bc3136d42acbabab837128ff471507
+SHA256 (hugin-0.6.1.tar.bz2) = 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7
+SIZE (hugin-0.6.1.tar.bz2) = 2151921
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr 5 Mar 2005 19:26:29 -0000 1.2
+++ pkg-descr 23 Jan 2007 15:49:19 -0000
@@ -5,6 +5,3 @@
more.
WWW: http://hugin.sourceforge.net/
-
-- Ported by Cartola
-cartola@openit.com.br
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist 30 Jan 2006 14:40:58 -0000 1.4
+++ pkg-plist 23 Jan 2007 15:49:19 -0000
@@ -1,4 +1,6 @@
bin/autooptimiser
+bin/color_correct_tiff
+bin/fulla
bin/hugin
bin/nona
bin/nona_gui
@@ -18,8 +20,6 @@
%%DATADIR%%/xrc/data/CPCursor4.png
%%DATADIR%%/xrc/data/CPCursor5.png
%%DATADIR%%/xrc/data/CPCursor6.png
-%%DATADIR%%/xrc/data/FAQ.html
-%%DATADIR%%/xrc/data/FAQ_fr.html
%%DATADIR%%/xrc/data/about.htm
%%DATADIR%%/xrc/data/about_fr.htm
%%DATADIR%%/xrc/data/center_pano.xpm
@@ -40,8 +40,26 @@
%%DATADIR%%/xrc/data/filesaveas.png
%%DATADIR%%/xrc/data/find.png
%%DATADIR%%/xrc/data/fit_pano.xpm
+%%DATADIR%%/xrc/data/help_common/horiz-guide.jpg
+%%DATADIR%%/xrc/data/help_common/hugin.png
+%%DATADIR%%/xrc/data/help_common/problem-circle.jpg
+%%DATADIR%%/xrc/data/help_en_EN/FAQ.html
+%%DATADIR%%/xrc/data/help_en_EN/contents.html
+%%DATADIR%%/xrc/data/help_en_EN/hugin.hhc
+%%DATADIR%%/xrc/data/help_en_EN/hugin.hhk
+%%DATADIR%%/xrc/data/help_en_EN/hugin.hhp
+%%DATADIR%%/xrc/data/help_en_EN/keyboard.html
+%%DATADIR%%/xrc/data/help_en_EN/license.html
+%%DATADIR%%/xrc/data/help_en_EN/manual.html
+%%DATADIR%%/xrc/data/help_fr_FR/FAQ.html
+%%DATADIR%%/xrc/data/help_fr_FR/contents.html
+%%DATADIR%%/xrc/data/help_fr_FR/hugin.hhc
+%%DATADIR%%/xrc/data/help_fr_FR/hugin.hhk
+%%DATADIR%%/xrc/data/help_fr_FR/hugin.hhp
+%%DATADIR%%/xrc/data/help_fr_FR/keyboard.html
+%%DATADIR%%/xrc/data/help_fr_FR/license.html
+%%DATADIR%%/xrc/data/help_fr_FR/manual.html
%%DATADIR%%/xrc/data/hugin.png
-%%DATADIR%%/xrc/data/horiz-guide.jpg
%%DATADIR%%/xrc/data/icon.ico
%%DATADIR%%/xrc/data/icon.png
%%DATADIR%%/xrc/data/icon_128x128.ico
@@ -54,13 +72,10 @@
%%DATADIR%%/xrc/data/icon_72x72.ico
%%DATADIR%%/xrc/data/icon_96x96.ico
%%DATADIR%%/xrc/data/info.xpm
-%%DATADIR%%/xrc/data/keyboard.html
-%%DATADIR%%/xrc/data/keyboard_fr.html
%%DATADIR%%/xrc/data/keyboard_pl.html
%%DATADIR%%/xrc/data/list.png
%%DATADIR%%/xrc/data/logo.png
%%DATADIR%%/xrc/data/manual.html
-%%DATADIR%%/xrc/data/manual_fr.html
%%DATADIR%%/xrc/data/optimize.png
%%DATADIR%%/xrc/data/optimize.xpm
%%DATADIR%%/xrc/data/preview.png
@@ -68,7 +83,6 @@
%%DATADIR%%/xrc/data/preview_show_all.png
%%DATADIR%%/xrc/data/preview_show_none.png
%%DATADIR%%/xrc/data/print.xpm
-%%DATADIR%%/xrc/data/problem-circle.jpg
%%DATADIR%%/xrc/data/redo.png
%%DATADIR%%/xrc/data/reload.png
%%DATADIR%%/xrc/data/searchfind.xpm
@@ -101,9 +115,11 @@
%%DATADIR%%/xrc/ptstitcher_panel.xrc
%%DATADIR%%/xrc/run_optimizer_frame.xrc
%%DATADIR%%/xrc/run_stitcher_frame.xrc
+%%DATADIR%%/xrc/vig_corr_dlg.xrc
share/applications/hugin.desktop
share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
%%NLS%%share/locale/ca_ES/LC_MESSAGES/hugin.mo
+%%NLS%%share/locale/cs_CZ/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/de/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/de/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/fr/LC_MESSAGES/hugin.mo
@@ -120,20 +136,29 @@
%%NLS%%share/locale/pt_BR/LC_MESSAGES/nona_gui.mo
%%NLS%%share/locale/ru/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/ru/LC_MESSAGES/nona_gui.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/hugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/hugin.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/nona_gui.mo
share/mime/packages/hugin.xml
share/pixmaps/hugin.png
-@dirrm share/applications
-@dirrm share/icons/gnome/48x48/mimetypes
-@dirrm share/icons/gnome/48x48
-@dirrm share/icons/gnome
-@dirrm share/icons
-%%NLS%%@dirrm share/locale/ca_ES/LC_MESSAGES
-%%NLS%%@dirrm share/locale/ca_ES
+@dirrmtry share/applications
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
+@dirrmtry share/icons/gnome
+@dirrmtry share/icons
+%%NLS%%@dirrmtry share/locale/ca_ES/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca_ES
+%%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs_CZ
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
@dirrmtry share/mime/packages
@dirrmtry share/mime
-@dirrm share/pixmaps
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%/xrc/data/help_common
+@dirrm %%DATADIR%%/xrc/data/help_en_EN
+@dirrm %%DATADIR%%/xrc/data/help_fr_FR
@dirrm %%DATADIR%%/xrc/data
@dirrm %%DATADIR%%/xrc
@dirrm %%DATADIR%%
Index: files/patch-bootstrap
===================================================================
RCS file: files/patch-bootstrap
diff -N files/patch-bootstrap
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-bootstrap 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,50 @@
+--- bootstrap.orig Mon Aug 21 01:19:33 2006
++++ bootstrap Fri Jan 19 09:57:39 2007
+@@ -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 $?
+
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure 14 Aug 2005 13:43:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig Thu Aug 11 20:04:18 2005
-+++ configure Thu Aug 11 20:04:23 2005
-@@ -23388,7 +23388,7 @@
- failed=0;
- passed=0;
- PANO_OLD_LDFLAGS=$LDFLAGS
-- PANO_OLD_CPPFLAGS=$LDFLAGS
-+ PANO_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$HCPU" = 'xamd64' ; then
- LDFLAGS="$LDFLAGS -L$PANO_HOME/lib64"
- else
Index: files/patch-configure.ac
===================================================================
RCS file: files/patch-configure.ac
diff -N files/patch-configure.ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-configure.ac 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,36 @@
+--- configure.ac.orig Mon Aug 21 01:19:33 2006
++++ configure.ac Tue Jan 23 15:48:26 2007
+@@ -35,6 +35,10 @@
+ ;;
+ esac
+ ;;
++ *freebsd*)
++ HSYS=freebsd
++ HCPU="${target_cpu}"
++ ;;
+ darwin*)
+ HSYS=darwin
+ HCPU="${target_cpu}"
+@@ -56,6 +60,7 @@
+ ;;
+ esac
+ AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
++AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
+ AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
+ AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
+
+@@ -240,6 +245,14 @@
+ where wxWidgets libraries are installed (returned by
+ 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+ equivalent variable and wxWidgets version is 2.4.2 or above.
++ ])
++fi
++
++AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
++if test "x$HAVE_WXRC" != x1; then
++ AC_MSG_ERROR([
++ The wxrc program was not installed or not found.
++ Please check the wxWidgets installation.
+ ])
+ fi
+
Index: files/patch-m4_ax_boost.m4
===================================================================
RCS file: files/patch-m4_ax_boost.m4
diff -N files/patch-m4_ax_boost.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-m4_ax_boost.m4 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,11 @@
+--- m4/ax_boost.m4.orig Tue Feb 21 01:45:30 2006
++++ m4/ax_boost.m4 Mon Jan 22 17:52:39 2007
+@@ -97,7 +97,7 @@
+ dnl this location ist chosen if boost libraries are installed with the --layout=system option
+ dnl or if you install boost with RPM
+ if test "$ac_boost_path" != ""; then
+- BOOST_LDFLAGS="-L$ac_boost_path/lib"
++ BOOST_LDFLAGS="-L$ac_boost_path/lib $PTHREAD_LIBS"
+ BOOST_CPPFLAGS="-I$ac_boost_path/include"
+ else
+ for ac_boost_path_tmp in /usr /usr/local /opt ; do
Index: files/patch-m4_ax_check_graphics.m4
===================================================================
RCS file: files/patch-m4_ax_check_graphics.m4
diff -N files/patch-m4_ax_check_graphics.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-m4_ax_check_graphics.m4 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,74 @@
+--- m4/ax_check_graphics.m4.orig Wed Jan 17 15:23:15 2007
++++ m4/ax_check_graphics.m4 Wed Jan 17 15:27:55 2007
+@@ -44,7 +44,7 @@
+ ZLIB_OLD_LDFLAGS=$LDFLAGS
+ ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+ if test "x$ZLIB_HOME" != 'x' ; then
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
+ else
+ LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
+@@ -69,7 +69,7 @@
+ LIB_ZLIB="-lz"
+ ZLIB_FLAGS="-DHasZLIB"
+ else
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
+ else
+ LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
+@@ -133,7 +133,7 @@
+ PNG_OLD_LDFLAGS=$LDFLAGS
+ PNG_OLD_CPPFLAGS=$CPPFLAGS
+ if test "x$PNG_HOME" != 'x' ; then
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
+ else
+ LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
+@@ -158,7 +158,7 @@
+ LIB_PNG="-lpng"
+ PNG_FLAGS="-DHasPNG"
+ else
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LIB_PNG="-L$PNG_HOME/lib64 -lpng"
+ else
+ LIB_PNG="-L$PNG_HOME/lib -lpng"
+@@ -224,7 +224,7 @@
+ JPEG_OLD_LDFLAGS=$LDFLAGS
+ JPEG_OLD_CPPFLAGS=$CPPFLAGS
+ if test "x$JPEG_HOME" != 'x' ; then
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
+ else
+ LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
+@@ -274,7 +274,7 @@
+ LIB_JPEG="-ljpeg"
+ JPEG_FLAGS="-DHasJPEG"
+ else
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
+ else
+ LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
+@@ -339,7 +339,7 @@
+ TIFF_OLD_LDFLAGS=$LDFLAGS
+ TIFF_OLD_CPPFLAGS=$CPPFLAGS
+ if test "x$TIFF_HOME" != 'x' ; then
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
+ else
+ LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
+@@ -364,7 +364,7 @@
+ LIB_TIFF="-ltiff"
+ TIFF_FLAGS="-DHasTIFF"
+ else
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
+ else
+ LIB_TIFF="-L$TIFF_HOME/lib -ltiff"
Index: files/patch-m4_ax_check_panotools.m4
===================================================================
RCS file: files/patch-m4_ax_check_panotools.m4
diff -N files/patch-m4_ax_check_panotools.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-m4_ax_check_panotools.m4 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,20 @@
+--- m4/ax_check_panotools.m4.orig Wed Jan 17 15:30:39 2007
++++ m4/ax_check_panotools.m4 Wed Jan 17 15:31:10 2007
+@@ -44,7 +44,7 @@
+ passed=0;
+ PANO_OLD_LDFLAGS=$LDFLAGS
+ PANO_OLD_CPPFLAGS=$CPPFLAGS
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LDFLAGS="$LDFLAGS -L$PANO_HOME/lib64"
+ else
+ LDFLAGS="$LDFLAGS -L$PANO_HOME/lib"
+@@ -76,7 +76,7 @@
+ LIB_PANO="-lpano12"
+ PANO_FLAGS="-DHasPANO"
+ else
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ LIB_PANO="-L$PANO_HOME/lib64 -lpano12"
+ else
+ LIB_PANO="-L$PANO_HOME/lib -lpano12"
Index: files/patch-m4_fftw.m4
===================================================================
RCS file: files/patch-m4_fftw.m4
diff -N files/patch-m4_fftw.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-m4_fftw.m4 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,26 @@
+--- m4/ax_fftw.m4.orig Wed Jan 17 15:31:31 2007
++++ m4/ax_fftw.m4 Wed Jan 17 15:32:36 2007
+@@ -12,7 +12,7 @@
+ AC_HELP_STRING([--with-fftw=DIR],
+ [where the root of FFTW is installed ]),
+ [ ac_fftw_includes="$withval"/include
+- if test "x$HCPU" = 'xamd64' ; then
++ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ ac_fftw_libraries="$withval"/lib64
+ else
+ ac_fftw_libraries="$withval"/lib
+@@ -45,12 +45,12 @@
+ AC_FIND_FILE(fftw.h, $fftw_incdirs, fftw_incdir)
+ ac_fftw_includes="$fftw_incdir"
+
+-if test "x$HCPU" = 'xamd64' ; then
++if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ fftw_libdirs="/usr/lib64/fftw/lib64 /usr/lib64 /opt/lib64 /mingw/lib64 /usr/local/fftw/lib64 /usr/local/lib64 /usr/lib64/fftw $FFTWLIB"
+ else
+ fftw_libdirs="/usr/lib/fftw/lib /usr/lib /opt/lib /mingw/lib /usr/local/fftw/lib /usr/local/lib /usr/lib/fftw $FFTWLIB"
+ fi
+-if test "x$HCPU" = 'xamd64' ; then
++if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
+ test -n "$FFTWDIR" && fftw_libdirs="$FFTWDIR/lib64 $FFTWDIR $fftw_libdirs"
+ else
+ test -n "$FFTWDIR" && fftw_libdirs="$FFTWDIR/lib $FFTWDIR $fftw_libdirs"
Index: files/patch-src_hugin_xrc_Makefile.am
===================================================================
RCS file: files/patch-src_hugin_xrc_Makefile.am
diff -N files/patch-src_hugin_xrc_Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src_hugin_xrc_Makefile.am 23 Jan 2007 15:49:19 -0000
@@ -0,0 +1,8 @@
+--- src/hugin/xrc/Makefile.am.orig Tue Jan 23 15:13:43 2007
++++ src/hugin/xrc/Makefile.am Tue Jan 23 15:52:04 2007
+@@ -42,4 +42,4 @@
+ dist_xrc_DATA = $(XRC_FILES)
+
+ .xrc.xrs:
+- -wxrc -g -o $(srcdir)/$@ $<
++ -$(WXRC) -g -o $(srcdir)/$@ $<
--- hugin.diff ends here ---
--
Vasil Dimov
gro.DSBeerF@dv
%
Success is getting what you want; happiness is wanting what you get.
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070123160111.GA21270>