From zeising@daemonic.se  Sat Jun  4 22:11:30 2011
Return-Path: <zeising@daemonic.se>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 67B8A1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jun 2011 22:11:30 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (unknown [IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id ABE708FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jun 2011 22:11:27 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id 2D63740005
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Jun 2011 00:11:26 +0200 (CEST)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id 1C32540007; Sun,  5 Jun 2011 00:11:26 +0200 (CEST)
Received: from mx.daemonic.se (h-90-99.A163.priv.bahnhof.se [79.136.90.99])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id D032840005
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Jun 2011 00:11:23 +0200 (CEST)
Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2001:470:dca9:0:1::4])
	by mx.daemonic.se (Postfix) with ESMTPS id D28B2119C04
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Jun 2011 00:11:22 +0200 (CEST)
Received: from vincent.daemonic.se (login.daemonic.se [IPv6:2001:470:dca9:0:1::10])
	by mail.daemonic.se (Postfix) with ESMTPS id AC60812B2DA
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Jun 2011 00:11:22 +0200 (CEST)
Received: (from zeising@localhost)
	by vincent.daemonic.se (8.14.4/8.14.4/Submit) id p54MBMso014537;
	Sun, 5 Jun 2011 00:11:22 +0200 (CEST)
	(envelope-from zeising)
Message-Id: <201106042211.p54MBMso014537@vincent.daemonic.se>
Date: Sun, 5 Jun 2011 00:11:22 +0200 (CEST)
From: Niclas Zeising <niclas.zeising@gmail.com>
Reply-To: Niclas Zeising <niclas.zeising@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Makefile cleanup and configure argument fixes to x11-wm/fvwm2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         157617
>Category:       ports
>Synopsis:       [PATCH] Makefile cleanup and configure argument fixes to x11-wm/fvwm2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cy
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 04 22:20:08 UTC 2011
>Closed-Date:    Sun Jun 05 05:38:15 UTC 2011
>Last-Modified:  Sun Jun  5 05:40:10 UTC 2011
>Originator:     Niclas Zeising
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD vincent.daemonic.se 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Wed Apr 20 17:22:47 CEST 2011 root@vincent.daemonic.se:/usr/obj/usr/src/sys/VINCENT amd64


	
>Description:
	The arguments to sent to the configure script for x11-wm/fvwm2 are partly broken. There are several arguments passed that does not exist anymore (generating a warning from configure) and at least the dependency on png is picked up regardless of the option. There is also a hidden dependency on graphics/librsvg2 if that port is installed. Lastly, the support for multibyte characters is either removed completely or always turned on, so that option is removed.
>How-To-Repeat:
	
>Fix:
	Attached patch cleans up the configure arguments and properly disables png when needed. It also adds an explicit optional dependency on librsvg2, as well as optional explicit dependencies on GNOME (version 1) and imlib. There might be reason to just rip GNOME 1 and imlib support out of the port, since especially GNOME 1 is hardly ever used.


--- fvwm2.Makefile.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/fvwm2/Makefile,v
retrieving revision 1.83
diff -u -d -r1.83 Makefile
--- Makefile	19 Apr 2011 01:48:58 -0000	1.83
+++ Makefile	4 Jun 2011 21:39:43 -0000
@@ -24,7 +24,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X_CFLAGS=-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--with-png-library=${LOCALBASE}/lib
+CONFIGURE_ARGS= --mandir=${MANPREFIX}/man
 USE_GMAKE=	yes
 USE_XORG=	xpm xft
 USE_BZIP2=	yes
@@ -35,10 +35,11 @@
 		STROKE		"Enable support for mouse gestures" off \
 		RPLAY		"Enable RPlay support in FvwmEvent" off \
 		SESSION_MGMT	"Enable Session Management support" on \
-		MULTIBYTE	"Enable multibyte character support" on \
 		PNG		"Build with PNG graphics support" on \
+		SVG		"Build with SVG graphics support using librsvg2" off \
 		BIDI		"Enable Asian bi-directional text support" off \
 		NLS		"Enable National Language Support" on \
+		IMLIB		"Enable imlib library (requires gtk12)" off \
 		GNOME		"Enable GNOME desktop support" off
 
 .include <bsd.port.pre.mk>
@@ -54,45 +55,54 @@
 USE_ICONV=		yes
 CONFIGURE_ARGS+=	--with-iconv-library=${LOCALBASE}/lib \
 			--with-iconv-includes=${LOCALBASE}/include \
-			--mandir=${LOCALBASE}/man
 .endif
 
 .if defined(WITH_STROKE)
 LIB_DEPENDS+=	stroke.0:${PORTSDIR}/devel/libstroke
-CONFIGURE_ARGS+=	--with-stroke --with-stroke-library=${LOCALBASE}/lib \
+CONFIGURE_ARGS+=	--with-stroke-library=${LOCALBASE}/lib \
 			--with-stroke-includes=${LOCALBASE}/include
+.else
+CONFIGURE_ARGS+=	--without-stroke-library
 .endif
 
 .if defined(WITH_RPLAY)
 LIB_DEPENDS+=	rplay.1:${PORTSDIR}/audio/rplay
-CONFIGURE_ARGS+=	--with-rplay --with-rplay-library=${LOCALBASE}/lib \
+CONFIGURE_ARGS+=	--with-rplay-library=${LOCALBASE}/lib \
 			--with-rplay-includes=${LOCALBASE}/include
+.else
+CONFIGURE_ARGS+=	--without-rplay-library
 .endif
 
 .if defined(WITHOUT_SESSION_MGMT)
 CONFIGURE_ARGS+=	--disable-sm
 .endif
 
-.if defined(WITH_MULTIBYTE)
-CONFIGURE_ARGS+=	--enable-multibyte
-.endif
-
 .if !defined(WITHOUT_PNG)
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=	--with-png --with-png-includes=${LOCALBASE}/include \
+CONFIGURE_ARGS+=	--with-png-includes=${LOCALBASE}/include \
 			--with-png-library=${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=	--without-png-library
+.endif
+
+.if defined(WITH_SVG) && !defined(WITHOUT_SVG)
+USE_GNOME+=	librsvg2
+.else
+CONFIGURE_ARGS+=	--disable-rsvg
 .endif
 
 .if defined(WITHOUT_BIDI)
 CONFIGURE_ARGS+=	--disable-bidi
 .else
 LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
+CONFIGURE_ARGS+=	--enable-bidi \
+			--with-bidi-bindir=${LOCALBASE}/bin
 .endif
 
 PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
 
-.if ${HAVE_GNOME:Mimlib}!=""
-USE_GNOME=	imlib
+.if defined(WITH_IMLIB) && !defined(WITHOUT_GTK)
+USE_GNOME+=	imlib
 CONFIGURE_ARGS+=	--enable-gtktest --enable-imlibtest
 PLIST_SUB+=	GTK=""
 MAN1+=		FvwmGtk.1
@@ -105,7 +115,7 @@
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-CONFIGURE_ARGS+=	--with-intl --with-intl-library=${LOCALBASE}/lib \
+CONFIGURE_ARGS+=	--with-intl-library=${LOCALBASE}/lib \
 			--with-intl-includes=${LOCALBASE}/include
 PLIST_SUB+=	NLS=""
 .else
@@ -114,9 +124,10 @@
 .endif
 
 .if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints
+CONFIGURE_ARGS+=	--without-gnome
 .else
-CONFIGURE_ARGS+=	--with-gnome --enable-gnome-hints
+USE_GNOME+=gnomelibs
+CONFIGURE_ARGS+=	--with-gnome
 .endif
 
 MAN1+=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
--- fvwm2.Makefile.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->cy 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 4 22:20:18 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157617 
State-Changed-From-To: open->closed 
State-Changed-By: cy 
State-Changed-When: Sun Jun 5 05:37:57 UTC 2011 
State-Changed-Why:  
Committed. Thanks for the patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157617 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157617: commit references a PR
Date: Sun,  5 Jun 2011 05:30:25 +0000 (UTC)

 cy          2011-06-05 05:30:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/fvwm2-devel   Makefile 
   Added files:
     x11-wm/fvwm2-devel/files patch-configure.ac 
   Log:
   Configuration improvements:
   
   - Add knobs for SVG and IMLIB.
   - Remove redundant MULTIBYTE option.
   - Add includes to args passed to configure script.
   - Fix libXcursor detection.
   
   PR:             157617 and 157618
   Submitted by:   Niclas Zeising <niclas.zeising@gmail.com>
   
   Revision  Changes    Path
   1.125     +29 -16    ports/x11-wm/fvwm2-devel/Makefile
   1.1       +11 -0     ports/x11-wm/fvwm2-devel/files/patch-configure.ac (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157617: commit references a PR
Date: Sun,  5 Jun 2011 05:31:28 +0000 (UTC)

 cy          2011-06-05 05:31:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/fvwm2         Makefile 
   Added files:
     x11-wm/fvwm2/files   patch-configure.ac 
   Log:
   Configuration improvements:
   
   - Add knobs for SVG and IMLIB.
   - Remove redundant MULTIBYTE option.
   - Add includes to args passed to configure script.
   - Fix libXcursor detection.
   
   PR:             157617 and 157618
   Submitted by:   Niclas Zeising <niclas.zeising@gmail.com>
   
   Revision  Changes    Path
   1.84      +29 -16    ports/x11-wm/fvwm2/Makefile
   1.1       +11 -0     ports/x11-wm/fvwm2/files/patch-configure.ac (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
