Attachment 106488 Details for Bug 147103 – 2-emacs-OPTIONS.diff

[patch] 2-emacs-OPTIONS.diff

2-emacs-OPTIONS.diff (text/x-diff), 2.32 KB, created by Ashish Shukla on 2010-05-27 18:56:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish Shukla

Created: 2010-05-27 18:56:04 UTC

Size: 2.32 KB

patch

obsolete

>diff -urN emacs.orig/Makefile emacs/Makefile
>--- emacs.orig/Makefile	2010-05-27 23:19:24.000000000 +0530
>+++ emacs/Makefile	2010-05-27 23:18:10.000000000 +0530
>@@ -27,8 +27,7 @@
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
> USE_BZIP2=	yes
>-
>-USE_GETTEXT=	yes
>+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
> 
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
>@@ -48,25 +47,23 @@
> 
> OPTIONS=	DBUS	"DBus support"			ON \
> 		GCONF	"GConf support"			ON \
>-		GIF	"GIF support"			ON \
>-		GTK2	"GTK+ support"			ON \
>-		JPEG	"JPEG support"			ON \
>+		GIF	"GIF Images support"		ON \
>+		JPEG	"JPEG images support"		ON \
> 		M17N	"M17N support for text-shaping"	ON \
>-		MOTIF	"Motif support"			OFF \
>-		OTF	"Opentype Font"			ON \
>-		PNG	"PNG support"			ON \
>+		MOTIF	"Use Motif widgets"		OFF \
>+		OTF	"Opentype Font Support"		ON \
>+		PNG	"PNG images support"		ON \
> 		SOUND	"Sound support"			ON \
> 		SOURCES	"Install source code"		ON \
>-		SVG	"SVG support"			ON \
>-		TIFF	"TIFF support"			ON \
>-		X11	"X11 support"			ON \
>-		XAW	"XAW support"			OFF \
>-		XAW3D	"XAW3D support"			OFF \
>+		SVG	"SVG images support"		ON \
>+		TIFF	"TIFF images support"		ON \
>+		XAW	"Use Athena widgets"		OFF \
>+		XAW3D	"Use Athena3D widgets"		OFF \
> 		SYNC_INPUT	"Synchronously process asynchronous input"	ON \
> 		SCROLLBARS	"Without toolkit scroll-bars"			ON \
>-		XFT	"Xft support"			ON \
>-		XIM	"XIM support"			ON \
>-		XPM	"XPM support"			ON
>+		XFT	"Freetype fonts support"	ON \
>+		XIM	"X Input Method support"	ON \
>+		XPM	"XPM images support"		ON
> 
> .include <bsd.port.options.mk>
> 
>@@ -171,7 +168,6 @@
> .if !defined(WITHOUT_XFT)
> LIB_DEPENDS+=	m17n.4:${PORTSDIR}/devel/m17n-lib
> .endif
>-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib -lintl"
> .endif
> 
> .if defined(WITHOUT_OTF)
>@@ -197,12 +193,9 @@
> .if defined(WITHOUT_DBUS)
> CONFIGURE_ARGS+=	--without-dbus
> .else
>-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus \
>-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
>+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
> .endif
> 
>-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
>-
> .include <bsd.port.pre.mk>
> 
> .if defined(WITHOUT_SOURCES)
>@@ -216,7 +209,7 @@
> .endif
> 
> .if ${OSVERSION} < 700000 && defined(WITHOUT_X11) && defined(WITH_DBUS)
>-BROKEN= Does not currently build with dbus support but without X11
>+BROKEN=	Does not currently build with dbus support but without X11
> .endif
> 
> post-patch:

Actions: View | Diff

Attachments on bug 147103: 106484 | 106485 | 106486 | 106487 | 106488 | 106489