Date: Fri, 2 May 2003 16:34:36 +0200 (CEST) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: cy@FreeBSD.org Subject: ports/51693: [PATCH] Unbreak w11-fm/fvwm2-devel Message-ID: <200305021434.h42EYaXa003188@roadrunner.local> Resent-Message-ID: <200305021440.h42EeBk2014098@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51693 >Category: ports >Synopsis: [PATCH] Unbreak w11-fm/fvwm2-devel >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri May 02 07:40:10 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD roadrunner 4.8-STABLE FreeBSD 4.8-STABLE #1: Thu May 1 10:54:57 CEST 2003 root@coyote:/usr/obj/usr/src/sys/ROADRUNNER i386 >Description: Changes include: o Make configure detect gettext, libintl and fontconfig o Bump so-version for libiconv Supersedes ports/51460 and ports/51461 >How-To-Repeat: >Fix: --- patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/fvwm2-devel/Makefile,v retrieving revision 1.60 diff -u -r1.60 Makefile --- Makefile 23 Apr 2003 17:29:41 -0000 1.60 +++ Makefile 1 May 2003 12:43:42 -0000 @@ -33,7 +33,13 @@ .include <bsd.port.pre.mk> GNU_CONFIGURE= yes -CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include +# Make it find libiconv and libintl +CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include \ + CFLAGS=-I${LOCALBASE}/include \ + CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib +CONFIGURE_ARGS= --with-freetype-prefix=${LOCALBASE} --with-xft-prefix=${X11BASE} + .if defined(WITH_STROKE) CONFIGURE_ARGS+= --with-stroke --with-stroke-library=${LOCALBASE}/lib \ @@ -55,7 +61,7 @@ .endif .if !defined(WITHOUT_ICONV) -LIB_DEPENDS+= iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv CONFIGURE_ARGS+= --with-iconv-lib=/usr/local/lib \ --with-iconv-includes=/usr/local/include .endif Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/x11-wm/fvwm2-devel/files/patch-configure,v retrieving revision 1.2 diff -u -r1.2 patch-configure --- files/patch-configure 31 Oct 2002 23:11:26 -0000 1.2 +++ files/patch-configure 1 May 2003 12:43:42 -0000 @@ -1,20 +1,41 @@ ---- configure.orig Thu Oct 31 18:14:43 2002 -+++ configure Thu Oct 31 18:15:52 2002 -@@ -6157,7 +6157,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +--- configure.orig Fri Feb 28 11:13:12 2003 ++++ configure Thu May 1 14:25:39 2003 +@@ -5430,17 +5430,17 @@ + if test x$fc_config_exec_prefix != x ; then + fc_config_args="$fc_config_args --exec-prefix=$fc_config_exec_prefix" + if test x${FC_CONFIG+set} != xset ; then +- FC_CONFIG=$fc_config_exec_prefix/bin/fontconfig-config ++ FC_CONFIG=$fc_config_exec_prefix/bin/pkg-config + fi + fi + if test x$fc_config_prefix != x ; then + fc_config_args="$fc_config_args --prefix=$fc_config_prefix" + if test x${FC_CONFIG+set} != xset ; then +- FC_CONFIG=$fc_config_prefix/bin/fontconfig-config ++ FC_CONFIG=$fc_config_prefix/bin/pkg-config + fi + fi + # Extract the first word of "fontconfig-config", so it can be a program name with args. +-set dummy fontconfig-config; ac_word=$2 ++set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_FC_CONFIG+set}" = set; then +@@ -5487,13 +5487,14 @@ + if test "$FC_CONFIG" = "no" ; then + no_fc=yes else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpng ${png_LIBS} -lz -lm $LIBS" -+LIBS="-L%%LOCALBASE%%/lib -lpng ${png_LIBS} -lz -lm $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -6429,7 +6429,7 @@ - #define HAVE_PNG 1 - _ACEOF - -- png_LIBS="-lpng -lz" -+ png_LIBS="-L%%LOCALBASE%%/lib -lpng -lz" - problem_png="" - else - with_png=no ++ fc_config_args="$fc_config_args fontconfig" + FC_CFLAGS=`$FC_CONFIG $fc_config_args --cflags` + FC_LIBS=`$FC_CONFIG $fc_config_args --libs` +- fc_config_major_version=`$FC_CONFIG $fc_config_args --version | \ ++ fc_config_major_version=`$FC_CONFIG $fc_config_args --modversion | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +- fc_config_minor_version=`$FC_CONFIG $fc_config_args --version | \ ++ fc_config_minor_version=`$FC_CONFIG $fc_config_args --modversion | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` +- fc_config_micro_version=`$FC_CONFIG $fc_config_args --version | \ ++ fc_config_micro_version=`$FC_CONFIG $fc_config_args --modversion | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fc_min_major_version=`echo $min_fc_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` --- patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305021434.h42EYaXa003188>