Date: Sat, 2 Oct 2004 05:50:59 -0400 (EDT) From: parv@pair.com To: FreeBSD-gnats-submit@FreeBSD.org Cc: cy@FreeBSD.org Subject: ports/72252: x11-wm/fvwm2-devel - PATCH to update to 2.5.11 Message-ID: <20041002095059.3574B5701@default.chvlva.adelphia.net> Resent-Message-ID: <200410020950.i929oPPf037760@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72252 >Category: ports >Synopsis: x11-wm/fvwm2-devel - PATCH to update to 2.5.11 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Oct 02 09:50:24 GMT 2004 >Closed-Date: >Last-Modified: >Originator: parv >Release: FreeBSD 4.10-RELEASE-p3 i386 >Organization: >Environment: >Description: Update fvwm2 unstable to 2.5.11 w/ the following patch. It contains changes for both Makefile & distinfo. rant Darn Makefile looks for imlib, introduced earlier by not-me, w/o any explicit way to disbale it. Also adds "PKGNAMESUFFIX= -imlib" to the package name. Why? tnar >How-To-Repeat: Apply the patch (has embedded tabs). >Fix: --- Makefile.old Wed Apr 7 07:52:03 2004 +++ Makefile Sat Oct 2 05:29:32 2004 @@ -6,7 +6,7 @@ # PORTNAME= fvwm -PORTVERSION= 2.5.10 +PORTVERSION= 2.5.11 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -29,9 +29,14 @@ --with-iconv-includes=${LOCALBASE}/include .endif -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +.if !defined(WITHOUT_XFT) +LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +.else +CONFIGURE_ARGS+= --disable-xft --disable-xfttest +.endif + .if defined(WITH_STROKE) LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke .endif @@ -49,6 +54,10 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+= --disable-nls +.endif + .if defined(WITH_STROKE) CONFIGURE_ARGS+= --with-stroke --with-stroke-library=${LOCALBASE}/lib \ --with-stroke-includes=${LOCALBASE}/include @@ -77,6 +86,10 @@ .endif PLIST_SUB+= FVWM_VERSION="${PORTVERSION}" + +.if defined(WITHOUT_XRENDER) +CONFIGURE_ARGS+= --disable-xrender +.endif .if ${HAVE_GNOME:Mimlib}!="" USE_GNOME= imlib --- distinfo.old Sat Oct 2 03:47:04 2004 +++ distinfo Sat Oct 2 03:46:47 2004 @@ -1,2 +1,4 @@ -MD5 (fvwm-2.5.10.tar.bz2) = b3c86e2af2a4eabe692c9c849ff4b243 +MD5 (fvwm-2.5.11.tar.bz2) = c870620e61fdd0241959b0c541402537 +SIZE (fvwm-2.5.11.tar.bz2) = 1914736 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665 +SIZE (fvwm_icons.tgz) = 363406 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041002095059.3574B5701>