diff options
| author | pav <pav@FreeBSD.org> | 2004-07-05 23:14:00 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-07-05 23:14:00 +0800 |
| commit | 68a3bde735edc18418af478146965fe6b4d20fee (patch) | |
| tree | dcead2ab5b694b7e87718d53cfc648e43bd3e4ae /comms/hamfax | |
| parent | 02bc8a5cd65499010a46f4fd248cb28e7b73dd85 (diff) | |
| download | freebsd-ports-graphics-68a3bde735edc18418af478146965fe6b4d20fee.tar.gz freebsd-ports-graphics-68a3bde735edc18418af478146965fe6b4d20fee.tar.zst freebsd-ports-graphics-68a3bde735edc18418af478146965fe6b4d20fee.zip | |
- Unbreak on 4.x: pass threading library to linker
PR: ports/68654 (based on)
Submitted by: Carl Makin <carl@stagecraft.cx> (maintainer)
Diffstat (limited to 'comms/hamfax')
| -rw-r--r-- | comms/hamfax/Makefile | 8 | ||||
| -rw-r--r-- | comms/hamfax/files/patch-configure | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile index f468b98eaee..34287f87543 100644 --- a/comms/hamfax/Makefile +++ b/comms/hamfax/Makefile @@ -26,10 +26,4 @@ CONFIGURE_ARGS= --with-Qt-dir=${X11BASE} CXX="g++ ${PTHREAD_CFLAGS}" \ USE_GMAKE= yes USE_BZIP2= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Configure fails on 4.x" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/hamfax/files/patch-configure b/comms/hamfax/files/patch-configure index 783caecd6c2..2413addbdbb 100644 --- a/comms/hamfax/files/patch-configure +++ b/comms/hamfax/files/patch-configure @@ -1,11 +1,20 @@ ---- configure.orig Sat Jun 7 11:05:07 2003 -+++ configure Sat Jun 7 11:08:01 2003 +--- configure.orig Thu Jan 30 22:25:15 2003 ++++ configure Mon Jul 5 13:03:08 2004 +@@ -3714,7 +3714,7 @@ + bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | + sed s@$bnv_qt_lib_dir/lib@@ | sed s@[.].*@@`" + fi +- bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ bnv_qt_LIBS="$LIBS -L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" + else + # Use cached value or do search, starting with suggestions from + # the command line @@ -4172,7 +4172,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out` -+ bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out | grep -vi warning:` ++ bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out | grep -vi warning` if test x"$bnv_err_4" != x; then echo "$bnv_err_4" >&5 else |