From owner-freebsd-ports Thu Jan 24 6:10:17 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 61E4737B417 for ; Thu, 24 Jan 2002 06:10:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g0OEA1812220; Thu, 24 Jan 2002 06:10:01 -0800 (PST) (envelope-from gnats) Received: from sahiro.homeip.net (p14-dna05sawada.niigata.ocn.ne.jp [211.122.195.142]) by hub.freebsd.org (Postfix) with ESMTP id 86B9437B402 for ; Thu, 24 Jan 2002 06:04:41 -0800 (PST) Received: by sahiro.merseine.nu (Postfix, from userid 1000) id 292B0BAB7; Thu, 24 Jan 2002 23:04:29 +0900 (JST) Message-Id: <20020124140451.292B0BAB7@sahiro.merseine.nu> Date: Thu, 24 Jan 2002 23:04:29 +0900 (JST) From: SASAKI Katuhiro To: FreeBSD-gnats-submit@freebsd.org Cc: lehmann@ans-netz.de X-Send-Pr-Version: 3.113 Subject: ports/34229: Fix port: x11-wm/xfce (build problem) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 34229 >Category: ports >Synopsis: Fix port: x11-wm/xfce (build problem) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 24 06:10:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: SASAKI Katuhiro >Release: FreeBSD 4.4-RELEASE-p2 i386 >Organization: personal >Environment: >Description: Configure script of xfce automatically detect iconv library. When iconv library is detected, xfce tries to link the library and fails. Patch below add dependency on converters/iconv port (This dependency is optional if iconv library is not available on a system building this port.) and workaround for build problem. >How-To-Repeat: # cd /usr/ports/converters/iconv && make && make install ... # cd /usr/ports/x11-wm/xfce && make ... cc -O -pipe -o xfmenu xfmenu.o -L/usr/X11R6/lib ../libs/.libs/libxfwmcore.al -lXpm -L/usr/local/lib -lglib12 -lSM -lICE -lXext -lX11 -lXpm -lXpm xfmenu.o: In function `convert_code': xfmenu.o(.text+0x100): undefined reference to `iconv_open' xfmenu.o(.text+0x123): undefined reference to `iconv' xfmenu.o(.text+0x12f): undefined reference to `iconv_close' *** Error code 1 ... >Fix: diff -urN /usr/ports/x11-wm/xfce/Makefile xfce/Makefile --- /usr/ports/x11-wm/xfce/Makefile Thu Jan 24 04:07:35 2002 +++ xfce/Makefile Thu Jan 24 22:15:03 2002 @@ -46,11 +46,24 @@ CONFIGURE_ARGS+= --disable-xinerama .endif +.if exists(${LOCALBASE}/include/iconv.h) +WITH_ICONV= yes +.endif +.if defined(WITH_ICONV) +LIB_DEPENDS+= iconv:2:${PORTSDIR}/converters/iconv +.endif + pre-everything:: .if !defined(WITH_XFT) && ${XFREE86_VERSION} == 4 @${ECHO_MSG} @${ECHO_MSG} "If you want to enable anti-aliased font support," @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XFT=yes\"" + @${ECHO_MSG} +.endif +.if !defined(WITH_ICONV) + @${ECHO_MSG} + @${ECHO_MSG} "If you want to use iconv library," + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ICONV=yes\"" @${ECHO_MSG} .endif diff -urN /usr/ports/x11-wm/xfce/files/patch-xfmenu::Makefile.in xfce/files/patch-xfmenu::Makefile.in --- /usr/ports/x11-wm/xfce/files/patch-xfmenu::Makefile.in Thu Jan 1 09:00:00 1970 +++ xfce/files/patch-xfmenu::Makefile.in Thu Jan 24 21:08:46 2002 @@ -0,0 +1,11 @@ +--- xfmenu/Makefile.in.orig Mon Jan 21 04:16:57 2002 ++++ xfmenu/Makefile.in Thu Jan 24 16:24:53 2002 +@@ -141,7 +141,7 @@ + + xfmenu_LDADD = ../libs/libxfwmcore.la @DMALLOC_LIB@ @GLIB_LIBS@ \ + ${X_LIBS} ${X_PRE_LIBS} \ +- -lXext -lX11 -lXpm @XFT_LIBS@ ++ -lXext -lX11 -lXpm @XFT_LIBS@ @INTLLIBS@ + + + xfmenu_DEPENDENCIES = ../libs/libxfwmcore.la >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message