Date: Thu, 27 May 2010 10:00:07 GMT From: wahjava@gmail.com (Ashish SHUKLA) To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/147103: [patch] editors/emacs-nox11: skip OPTIONS and use WITHOUT_DBUS Message-ID: <201005271000.o4RA07A3080267@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/147103; it has been noted by GNATS.
From: wahjava@gmail.com (Ashish SHUKLA)
To: Anonymous <swell.k@gmail.com>
Cc: phoffman@proper.com, Giorgos Keramidas <keramida@freebsd.org>, bug-followup@FreeBSD.org
Subject: Re: ports/147103: [patch] editors/emacs-nox11: skip OPTIONS and use WITHOUT_DBUS
Date: Thu, 27 May 2010 15:19:44 +0530
--=-=-=
Anonymous writes:
[...]
> Not it doesn't. Try to build emacs with Xaw and without m17n, rsvg2,
> dbus-glib and gconf2. If it doesn't want to link with -lintl then why
> bother?
Fine.
[...]
> before <bsd.port.options.mk>, e.g. just after GNU_CONFIGURE?
> And drop dbus-glib dependency, please. Next time check ldd(1) output on
> nox11 build.
Thanks for noticing that.
Refer to the attached diff file.
Thanks
--
Ashish SHUKLA
Sent via Gnus from GNU Emacs
--=-=-=
Content-Disposition: attachment; filename=emacs.diff
Content-Description: editors/emacs diff
diff -urN /usr/ports/editors/emacs/Makefile emacs/Makefile
--- /usr/ports/editors/emacs/Makefile 2010-05-22 01:21:04.000000000 +0530
+++ emacs/Makefile 2010-05-27 15:13:59.000000000 +0530
@@ -27,8 +27,10 @@
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
-USE_GETTEXT= yes
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
MAN1= b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
grep-changelog.1 rcs-checkin.1
@@ -46,7 +48,6 @@
OPTIONS= DBUS "DBus support" ON \
GCONF "GConf support" ON \
GIF "GIF support" ON \
- GTK2 "GTK+ support" ON \
JPEG "JPEG support" ON \
M17N "M17N support for text-shaping" ON \
MOTIF "Motif support" OFF \
@@ -56,7 +57,6 @@
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 \
SYNC_INPUT "Synchronously process asynchronous input" ON \
@@ -110,10 +110,6 @@
CONFIGURE_ARGS+= --without-toolkit-scroll-bars
.endif
-.if defined(WITHOUT_SOUND)
-CONFIGURE_ARGS+= --without-sound
-.endif
-
.if defined(WITHOUT_SYNC_INPUT)
CONFIGURE_ARGS+= --without-sync-input
.endif
@@ -168,7 +164,7 @@
.if !defined(WITHOUT_XFT)
LIB_DEPENDS+= m17n.4:${PORTSDIR}/devel/m17n-lib
.endif
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
.endif
.if defined(WITHOUT_OTF)
@@ -191,15 +187,16 @@
.endif
+.if defined(WITHOUT_SOUND)
+CONFIGURE_ARGS+= --without-sound
+.endif
+
.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)
@@ -213,7 +210,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:
@@ -227,4 +224,12 @@
@${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif
+pre-everything::
+ @${ECHO_MSG}
+ @${ECHO_MSG} "====> By default Emacs is built with X11, DBUS, and GTK+ support."
+ @${ECHO_MSG} "====> To disable X11 support, define: WITHOUT_X11."
+ @${ECHO_MSG} "====> To disable GTK2 support, define: WITHOUT_GTK2."
+ @${ECHO_MSG} "====> To disable DBUS support, define: WITHOUT_DBUS."
+ @${ECHO_MSG}
+
.include <bsd.port.post.mk>
diff -urN /usr/ports/editors/emacs/files/patch-configure emacs/files/patch-configure
--- /usr/ports/editors/emacs/files/patch-configure 1970-01-01 05:30:00.000000000 +0530
+++ emacs/files/patch-configure 2010-05-27 15:04:26.000000000 +0530
@@ -0,0 +1,220 @@
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -6433,214 +6433,8 @@
+
+
+
+- ALSA_REQUIRED=1.0.0
+- ALSA_MODULES="alsa >= $ALSA_REQUIRED"
+-
+- succeeded=no
+-
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
+-fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-if test -n "$PKG_CONFIG"; then
+- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-
+- if test "$PKG_CONFIG" = "no" ; then
+- HAVE_ALSA=no
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- { $as_echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5
+-$as_echo_n "checking for $ALSA_MODULES... " >&6; }
+-
+- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+- succeeded=yes
+-
+- { $as_echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5
+-$as_echo_n "checking ALSA_CFLAGS... " >&6; }
+- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
+- { $as_echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
+-$as_echo "$ALSA_CFLAGS" >&6; }
+-
+- { $as_echo "$as_me:$LINENO: checking ALSA_LIBS" >&5
+-$as_echo_n "checking ALSA_LIBS... " >&6; }
+- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
+- { $as_echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
+-$as_echo "$ALSA_LIBS" >&6; }
+- else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+- ALSA_CFLAGS=""
+- ALSA_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"`
+-
+- fi
+-
+-
+-
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+-
+- if test $succeeded = yes; then
+- HAVE_ALSA=yes
+- else
+- HAVE_ALSA=no
+- fi
+-
+- if test $HAVE_ALSA = yes; then
+- SAVE_CFLAGS="$CFLAGS"
+- SAVE_LDFLAGS="$LDFLAGS"
+- CFLAGS="$ALSA_CFLAGS $CFLAGS"
+- LDFLAGS="$ALSA_LIBS $LDFLAGS"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <asoundlib.h>
+-int
+-main ()
+-{
+-snd_lib_error_set_handler (0);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- emacs_alsa_normal=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- emacs_alsa_normal=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test "$emacs_alsa_normal" != yes; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <alsa/asoundlib.h>
+-int
+-main ()
+-{
+-snd_lib_error_set_handler (0);
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- emacs_alsa_subdir=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- emacs_alsa_subdir=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test "$emacs_alsa_subdir" != yes; then
+- { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&5
+-$as_echo "$as_me: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+- fi
+-
+- CFLAGS="$SAVE_CFLAGS"
+- LDFLAGS="$SAVE_LDFLAGS"
+- LIBSOUND="$LIBSOUND $ALSA_LIBS"
+- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALSA 1
+-_ACEOF
+-
+- fi
+-
+-fi
+-
+-
+
+
+
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005271000.o4RA07A3080267>