Attachment 115764 Details for Bug 157617 – fvwm2.Makefile.diff

[patch] fvwm2.Makefile.diff

fvwm2.Makefile.diff (text/plain), 3.46 KB, created by Niclas Zeising on 2011-06-04 23:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2011-06-04 23:20:08 UTC

Size: 3.46 KB

patch

obsolete

>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 \

Actions: View | Diff

Attachments on bug 157617: 115764