From owner-svn-ports-all@FreeBSD.ORG Sat Mar 15 08:37:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A87C61E; Sat, 15 Mar 2014 08:37:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 56E3DE52; Sat, 15 Mar 2014 08:37:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2F8bn9k071004; Sat, 15 Mar 2014 08:37:49 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2F8bmoA071001; Sat, 15 Mar 2014 08:37:48 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201403150837.s2F8bmoA071001@svn.freebsd.org> From: Ashish SHUKLA Date: Sat, 15 Mar 2014 08:37:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348298 - in head/editors/emacs-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Mar 2014 08:37:49 -0000 Author: ashish Date: Sat Mar 15 08:37:48 2014 New Revision: 348298 URL: http://svnweb.freebsd.org/changeset/ports/348298 QAT: https://qat.redports.org/buildarchive/r348298/ Log: - Update to bzr snapshot revision 116732 - Add OPTIONs for building with GnuTLS 3.x[1] (default), and GnuTLS 2.x support - Remove OPTION for SYNC_INPUT (not supported) - Add a fix when building with ncurses port being installed - Fix CONFLICTS to pass portlint checks PR: ports/187346[1] Added: head/editors/emacs-devel/files/patch-src_Makefile.in (contents, props changed) Modified: head/editors/emacs-devel/Makefile head/editors/emacs-devel/distinfo Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Sat Mar 15 08:29:43 2014 (r348297) +++ head/editors/emacs-devel/Makefile Sat Mar 15 08:37:48 2014 (r348298) @@ -16,13 +16,13 @@ COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ - emacs24-* xemacs-[0-9]* xemacs-devel-[0-9]* \ +CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \ + emacs24-[0-9]* xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ emacs-nox11-[0-9]* EMACS_VER= 24.3.50 -EMACS_REV= 116446 +EMACS_REV= 116732 GNU_CONFIGURE= yes USES= ncurses pkgconfig USE_GMAKE= yes @@ -51,17 +51,16 @@ INFO= ada-mode auth autotype bovine cal org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \ smtpmail speedbar srecode todo-mode tramp url vip viper widget wisent woman -OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS \ +OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \ XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY -OPTIONS_SINGLE= X11 SOUND +OPTIONS_SINGLE= X11 SOUND GNUTLS ACL_DESC= ACL support GSETTINGS_DESC= GSettings support SCROLLBARS_DESC= Toolkit scroll-bars SOUND_DESC= Sound support SOURCES_DESC= Install sources -SYNC_INPUT_DESC= Synchronously process asynchronous input XAW_DESC= Athena widgets XAW3D_DESC= Athena3D widgets XIM_DESC= X Input Method Support @@ -69,12 +68,15 @@ M17N_DESC= M17N support for text-shapin OTF_DESC= Opentype fonts suport FILENOTIFY_DESC= File notification support LTO_DESC= Enable link-time optimization (requires GCC 4.6+) +GNUTLS2_DESC= GnuTLS 2.x +GNUTLS3_DESC= GnuTLS 3.x OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF OPTIONS_SINGLE_SOUND= ALSA OSS +OPTIONS_SINGLE_GNUTLS= GNUTLS2 GNUTLS3 -OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT \ - SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11 +OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \ + SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11 GNUTLS3 OPTIONS_SUB= SOURCES @@ -85,9 +87,11 @@ OSS_CONFIGURE_ON= --with-sound=oss DBUS_LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus -GNUTLS_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls +GNUTLS3_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls3 +GNUTLS2_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls + XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= xml2 @@ -155,7 +159,7 @@ XIM_CONFIGURE_WITH= xim LTO_CONFIGURE_ON= --enable-link-time-optimization LTO_USE= GCC=4.6+ -ACL_CONFIGURE_WITH= acl +ACL_CONFIGURE_OFF= --disable-acl FILENOTIFY_CONFIGURE_ON= --with-file-notification=gfile FILENOTIFY_CONFIGURE_OFF= --without-file-notification @@ -202,19 +206,35 @@ IGNORE= GSettings support requires DBUS. .include +# Building with GCC 4.6+ requires it +.if ${ncurses_ARGS} == "port" +LDFLAGS+= -ltinfo +.endif + .if ${ARCH} == "ia64" BROKEN= Emacs 24.X does not currently build on ia64 .endif +.if ${PORT_OPTIONS:MGNUTLS3} +GNUTLS3_RPATH= -Wl,-rpath,${LOCALBASE}/lib/gnutls3 +.else +GNUTLS3_RPATH= +.endif + post-patch: @${RM} -f ${WRKSRC}/info/* @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el .if defined(WITHOUT_X11) @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop .endif +.if ${PORT_OPTIONS:MGNUTLS3} + @${REINPLACE_CMD} -e '/HAVE_GNUTLS3=yes/s/gnutls >=/gnutls3 >=/' ${WRKSRC}/configure.ac +.endif post-configure: - @${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \ + -e 's|%%GNUTLS3_RPATH%%|${GNUTLS3_RPATH}|g' \ + ${WRKSRC}/src/Makefile add-plist-data: .for i in ${EMACS_DIRS} Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Sat Mar 15 08:29:43 2014 (r348297) +++ head/editors/emacs-devel/distinfo Sat Mar 15 08:37:48 2014 (r348298) @@ -1,2 +1,2 @@ -SHA256 (emacs-24.3.50.116446.tar.xz) = 3b68c3bea5208002ff94126ad2e6162914eabebe2fe61e7f3edb03f7c88d4104 -SIZE (emacs-24.3.50.116446.tar.xz) = 30678320 +SHA256 (emacs-24.3.50.116732.tar.xz) = b04fa64cd7a2cee8dd28f73c4e886c7963e095142a4b712bb8fbf619b307d000 +SIZE (emacs-24.3.50.116732.tar.xz) = 30661920 Added: head/editors/emacs-devel/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/emacs-devel/files/patch-src_Makefile.in Sat Mar 15 08:37:48 2014 (r348298) @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- src/Makefile.in.orig ++++ src/Makefile.in +@@ -283,7 +283,7 @@ + + LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ + +-LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ ++LIBGNUTLS_LIBS = %%GNUTLS3_RPATH%% @LIBGNUTLS_LIBS@ + LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ + + LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ +@@ -409,7 +409,7 @@ + $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ + $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ + $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ +- $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ ++ $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ + $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ) + + all: emacs$(EXEEXT) $(OTHER_FILES) +@@ -489,7 +489,7 @@ + ## to start if Vinstallation_directory has the wrong value. + temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \ + $(lib)/libgnu.a $(EMACSRES) +- $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ ++ $(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LIBGNUTLS_LIBS) $(LDFLAGS) \ + -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) + $(MKDIR_P) $(etc) + $(TEMACS_POST_LINK)