From owner-svn-ports-head@FreeBSD.ORG Mon Dec 9 13:01:13 2013 Return-Path: Delivered-To: svn-ports-head@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 488D985A; Mon, 9 Dec 2013 13:01:13 +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 33994180B; Mon, 9 Dec 2013 13:01:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9D1Drd008148; Mon, 9 Dec 2013 13:01:13 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9D1COn008145; Mon, 9 Dec 2013 13:01:12 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201312091301.rB9D1COn008145@svn.freebsd.org> From: Ashish SHUKLA Date: Mon, 9 Dec 2013 13:01:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335977 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 13:01:13 -0000 Author: ashish Date: Mon Dec 9 13:01:12 2013 New Revision: 335977 URL: http://svnweb.freebsd.org/changeset/ports/335977 Log: - Update to bzr snapshot revision 115370 - Add PKGNAMESUFFIX to avoid package name collision - Add STAGE support - Relocate INFO_PATH to avoid conflicting with similarly named info files provided by other packages, like print/texinfo - Use INSTALLS_ICONS only when X11 is enabled - Add OPTIONs for X11 support, SOUND (ALSA/OSS) support and filesystem notifications - Depend on GCC for i386 platforms until clang gets the required fixes - Stop compressing info files for it to work with INFO_PATH - Use OptionsNG helpers to cleanup Makefile - Remove already upstream-ed patches Deleted: head/editors/emacs-devel/files/patch-configure.ac head/editors/emacs-devel/files/patch-doc-emacs-Makefile.in head/editors/emacs-devel/files/patch-doc-lispintro-Makefile.in head/editors/emacs-devel/files/patch-doc-lispref-Makefile.in head/editors/emacs-devel/files/patch-doc-misc-Makefile.in head/editors/emacs-devel/files/patch-lib_verify.h head/editors/emacs-devel/files/patch-sources.el head/editors/emacs-devel/files/patch-src_coding.c head/editors/emacs-devel/files/patch-src_lisp.h head/editors/emacs-devel/files/patch-src_process.c head/editors/emacs-devel/files/patch-src_sysdep.c Modified: head/editors/emacs-devel/Makefile head/editors/emacs-devel/distinfo head/editors/emacs-devel/pkg-plist Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Mon Dec 9 12:49:53 2013 (r335976) +++ head/editors/emacs-devel/Makefile Mon Dec 9 13:01:12 2013 (r335977) @@ -8,6 +8,7 @@ CATEGORIES= editors ipv6 MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ashish +PKGNAMESUFFIX= -devel MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros @@ -15,47 +16,45 @@ COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING - CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ 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= 112532 +EMACS_REV= 115370 GNU_CONFIGURE= yes -USES= ncurses +USES= ncurses pkgconfig USE_GMAKE= yes USE_XZ= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --localstatedir=/var +INFO_PATH= ${DATADIR_REL}/info WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_AUTOTOOLS= autoconf:env automake:env aclocal:env autoheader:env -INSTALLS_ICONS= yes -EMACS_DIRS= ${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ +# Append --without-compress-install to prevent emacs from compressing info +# which bsd.port.mk is not able to detect +CONFIGURE_ARGS= --localstatedir=/var --without-compress-install + +EMACS_DIRS= ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ ${PREFIX}/libexec/${PORTNAME} -MAN1= ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ - grep-changelog.1 -MANCOMPRESSED= yes -PLIST_SUB= EMACS_VER=${EMACS_VER} +PLIST_SUB= EMACS_VER=${EMACS_VER} INFODIR=${INFO_PATH} MAKE_ENV= LC_ALL=C INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \ ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs-gnutls emacs epa \ - erc ert eshell eudc flymake forms gnus htmlfontify idlwave info \ + erc ert eshell eudc flymake forms gnus htmlfontify idlwave ido info \ mairix-el message mh-e newsticker nxml-mode \ org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve \ - smtpmail speedbar srecode tramp url vip viper widget wisent woman + smtpmail speedbar srecode todo-mode tramp url vip viper widget wisent woman -LATEST_LINK= emacs-devel -OPTIONS_DEFINE= ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS \ - XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO +OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SYNC_INPUT SCROLLBARS \ + XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY -OPTIONS_SINGLE= X11TOOLKIT +OPTIONS_SINGLE= X11 SOUND ACL_DESC= ACL support GSETTINGS_DESC= GSettings support @@ -68,179 +67,137 @@ XAW3D_DESC= Athena3D widgets XIM_DESC= X Input Method Support M17N_DESC= M17N support for text-shaping OTF_DESC= Opentype fonts suport +FILENOTIFY_DESC= File notification support LTO_DESC= Enable link-time optimization (requires GCC 4.6+) -OPTIONS_SINGLE_X11TOOLKIT= GTK2 GTK3 XAW XAW3D MOTIF +OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF +OPTIONS_SINGLE_SOUND= ALSA OSS 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 + SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11 -NO_STAGE= yes -.include +OPTIONS_SUB= SOURCES -DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE} +SOUND_CONFIGURE_OFF= --with-sound=no +ALSA_CONFIGURE_ON= --with-sound=alsa +OSS_CONFIGURE_ON= --with-sound=oss -.if defined(WITHOUT_X11) -CONFIGURE_ARGS+= --without-x -.else -USE_XORG= x11 -USE_GNOME= +DBUS_LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus +DBUS_CONFIGURE_WITH= dbus -.if ${PORT_OPTIONS:MSVG} -USE_GNOME+= librsvg2 -.else -CONFIGURE_ARGS+= --without-rsvg -.endif +GNUTLS_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --with-x-toolkit=gtk -.elif ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFIGURE_ARGS+= --with-x-toolkit=gtk3 -.elif ${PORT_OPTIONS:MXAW3D} -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -CONFIGURE_ARGS+= --with-x-toolkit=athena -.elif ${PORT_OPTIONS:MXAW} -USE_XORG= xaw -CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d -.elif ${PORT_OPTIONS:MMOTIF} -USES+= motif -CONFIGURE_ARGS+= --with-x-toolkit=motif -.endif +XML_USE= GNOME=libxml2 +XML_CONFIGURE_WITH= xml2 -.if !${PORT_OPTIONS:MSCROLLBARS} -CONFIGURE_ARGS+= --without-toolkit-scroll-bars -.endif +SVG_USE= GNOME=librsvg2 +SVG_CONFIGURE_WITH= rsvg -.if !${PORT_OPTIONS:MSYNC_INPUT} -CONFIGURE_ARGS+= --without-sync-input -.endif +X11_CONFIGURE_WITH= x +X11_USE= XORG=x11 -.if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg -.else -CONFIGURE_ARGS+= --without-jpeg -.endif +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff -.else -CONFIGURE_ARGS+= --without-tiff -.endif +GTK3_USE= GNOME=gtk30 +GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 -.if ${PORT_OPTIONS:MGIF} -LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib -.else -CONFIGURE_ARGS+= --without-gif -.endif +XAW3D_LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +XAW3D_CONFIGURE_ON= --with-x-toolkit=athena -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -.else -CONFIGURE_ARGS+= --without-png -.endif +XAW_USE= XORG=xaw +XAW_CONFIGURE_ON+= --with-x-toolkit=athena --without-xaw3d -.if ${PORT_OPTIONS:MXPM} -USE_XORG+= xpm -.else -CONFIGURE_ARGS+= --without-xpm -.endif +MOTIF_USES= motif +MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif -.if ${PORT_OPTIONS:MXFT} -USE_XORG+= xft -LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 -CONFIGURE_ARGS+= --with-xft -.if ${PORT_OPTIONS:MM17N} -CONFIGURE_ARGS+= --with-m17n-flt -LIB_DEPENDS+= m17n:${PORTSDIR}/devel/m17n-lib -.else -CONFIGURE_ARGS+= --without-m17n-flt -.endif -.if ${PORT_OPTIONS:MOTF} -CONFIGURE_ARGS+= --with-libotf -LIB_DEPENDS+= otf:${PORTSDIR}/print/libotf -.else -CONFIGURE_ARGS+= --without-libotf -.endif -.else -CONFIGURE_ARGS+= --without-xft -.if ${PORT_OPTIONS:MM17N} -IGNORE= m17n support for text-shaping requires Xft. Please run 'make config' -.elif ${PORT_OPTIONS:MOTF} -IGNORE= opentype fonts support requires Xft. Please run 'make config' -.endif -CONFIGURE_ARGS+= --without-libotf --without-m17n-flt -.endif +SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars -.if ${PORT_OPTIONS:MMAGICK} -LIB_DEPENDS+= MagickCore:${PORTSDIR}/graphics/ImageMagick -CONFIGURE_ARGS+= --with-imagemagick -.else -CONFIGURE_ARGS+= --without-imagemagick -.endif +SYNC_INPUT_CONFIGURE_WITH= sync-input -.if ${PORT_OPTIONS:MGSETTINGS} -USE_GNOME+= glib20 -CONFIGURE_ARGS+= --with-gsettings -.else -CONFIGURE_ARGS+= --without-gsettings -.endif +JPEG_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +JPEG_CONFIGURE_WITH= jpeg -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CONFIGURE_ARGS+= --with-gconf -.else -CONFIGURE_ARGS+= --without-gconf -.endif +TIFF_LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff +TIFF_CONFIGURE_WITH= tiff -.if ${PORT_OPTIONS:MXIM} -CONFIGURE_ARGS+= --with-xim -.else -CONFIGURE_ARGS+= --without-xim -.endif +GIF_LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib +GIF_CONFIGURE_WITH= gif -.endif +PNG_LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +PNG_CONFIGURE_WITH= png -.if ${PORT_OPTIONS:MSOUND} -CONFIGURE_ARGS+= --with-sound -.else -CONFIGURE_ARGS+= --without-sound +XPM_USE= XORG=xpm +XPM_CONFIGURE_WITH= xpm + +XFT_USE= XORG=xft +XFT_LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 +XFT_CONFIGURE_WITH= xft + +M17N_LIB_DEPENDS= m17n:${PORTSDIR}/devel/m17n-lib +M17N_CONFIGURE_WITH= m17n-flt + +OTF_LIB_DEPENDS= otf:${PORTSDIR}/print/libotf +OTF_CONFIGURE_WITH= libotf + +MAGICK_LIB_DEPENDS= MagickCore:${PORTSDIR}/graphics/ImageMagick +MAGICK_CONFIGURE_WITH= imagemagick + +GSETTINGS_USE= gnome=glib20 +GSETTINGS_CONFIGURE_WITH= gsettings + +GCONF_USE= gnome=gconf2 +GCONF_CONFIGURE_WITH= gconf + +XIM_CONFIGURE_WITH= xim + +LTO_CONFIGURE_ON= --enable-link-time-optimization +LTO_USE= GCC=4.6+ + +ACL_CONFIGURE_WITH= acl + +FILENOTIFY_CONFIGURE_ON= --with-file-notification=gfile +FILENOTIFY_CONFIGURE_OFF= --without-file-notification +FILENOTIFY_USE= GNOME=glib20 + +.include + +# clang is broken on i386 platform in -O2, due to use of alloca, and stack realignment +# and %esi as frame pointer register +# http://llvm.org/bugs/show_bug.cgi?id=18171 +.if ${ARCH} == "i386" +USE_GCC= any .endif -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus -CONFIGURE_ARGS+= --with-dbus -.else -CONFIGURE_ARGS+= --without-dbus -.if ${PORT_OPTIONS:MGSETTINGS} -IGNORE= GSettings support requires DBUS. Please run 'make config' +DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE} + +.if ${PORT_OPTIONS:MX11} + +INSTALLS_ICONS= yes + +.if !${PORT_OPTIONS:MXFT} +.if ${PORT_OPTIONS:MM17N} +IGNORE= m17n support for text-shaping requires Xft. Please run 'make config' +.elif ${PORT_OPTIONS:MOTF} +IGNORE= opentype fonts support requires Xft. Please run 'make config' .endif .endif -.if ${PORT_OPTIONS:MXML} -USE_GNOME+= libxml2 -CONFIGURE_ARGS+= --with-xml2 .else -CONFIGURE_ARGS+= --without-xml2 -.endif -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-gnutls -.else -CONFIGURE_ARGS+= --without-gnutls +.for OPT in SVG GTK2 GTK3 XAW3D XAW MOTIF SCROLLBARS JPEG TIFF GIF PNG XPM XFT M17N MAGICK GCONF GSETTINGS XIM +.if ${PORT_OPTIONS:M${OPT}} +IGNORE= ${OPT} option depends on X11 option .endif +.endfor -.if ${PORT_OPTIONS:MLTO} -USE_GCC= yes -CONFIGURE_ARGS+= --enable-link-time-optimization .endif -.if ${PORT_OPTIONS:MACL} -CONFIGURE_ARGS+= --with-acl -.else -CONFIGURE_ARGS+= --without-acl +.if !${PORT_OPTIONS:MDBUS} +.if ${PORT_OPTIONS:MGSETTINGS} +IGNORE= GSettings support requires DBUS. Please run 'make config' +.endif .endif .include @@ -261,27 +218,23 @@ post-configure: add-plist-data: .for i in ${EMACS_DIRS} - @${FIND} ${i} -type f |${SED} -E -e 's,^${PREFIX}/,,g' >>${TMPPLIST} + @${FIND} ${STAGEDIR}${i} -type f |${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,g' >>${TMPPLIST} .endfor - @${FIND} ${WRKSRC}/etc -type f |${SED} -E -e 's,^${WRKSRC},${DATADIR_REL}/${EMACS_VER},g' -e '/etc\/(\..*|ChangeLog|DOC)$$/d' >>${TMPPLIST} + @${FIND} ${WRKSRC}/etc -type f |${SED} -E -e 's,^${WRKSRC},${DATADIR_REL}/${EMACS_VER},g' -e '/etc\/(\..*|ChangeLog)$$/d' >>${TMPPLIST} @${FIND} ${WRKSRC}/etc -type d -depth |${SED} -E -e 's,^${WRKSRC},@dirrm ${DATADIR_REL}/${EMACS_VER},g' >>${TMPPLIST} .for i in ${EMACS_DIRS} - @${FIND} ${i} -type d -depth |${SED} -E -e 's,^${PREFIX}/,@dirrm ,g' >>${TMPPLIST} + @${FIND} ${STAGEDIR}${i} -type d -depth |${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,g' >>${TMPPLIST} .endfor @${ECHO} "@unexec rmdir %D/${DATADIR_REL}/${EMACS_VER} 2>/dev/null || true" >>${TMPPLIST} pre-configure: @cd ${WRKSRC} && ./autogen.sh -.if defined(WITH_SOURCES) -PLIST_SUB+= SOURCES="" - +.if ${PORT_OPTIONS:MSOURCES} post-install: - @${MKDIR} ${DATADIR}/${EMACS_VER}/src - @${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${DATADIR}/${EMACS_VER}/src - @${INSTALL_DATA} ${WRKSRC}/sources.el ${DATADIR}/${EMACS_VER}/site-lisp/site-start.el -.else -PLIST_SUB+= SOURCES="@comment " + @${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src + @${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src + @${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el .endif .if !defined(WITHOUT_X11) Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Mon Dec 9 12:49:53 2013 (r335976) +++ head/editors/emacs-devel/distinfo Mon Dec 9 13:01:12 2013 (r335977) @@ -1,2 +1,2 @@ -SHA256 (emacs-24.3.50.112532.tar.xz) = 45f3d33f2f2f291a78c499fe1d05bc2ce403d56f4ec4b0cbaba4bdb0558b54e4 -SIZE (emacs-24.3.50.112532.tar.xz) = 31509672 +SHA256 (emacs-24.3.50.115370.tar.xz) = bca04ba4a501ed63282d43e5b82c85b3827b45032e4c1d62d5ba2954768ee60b +SIZE (emacs-24.3.50.115370.tar.xz) = 30547236 Modified: head/editors/emacs-devel/pkg-plist ============================================================================== --- head/editors/emacs-devel/pkg-plist Mon Dec 9 12:49:53 2013 (r335976) +++ head/editors/emacs-devel/pkg-plist Mon Dec 9 13:01:12 2013 (r335977) @@ -5,10 +5,17 @@ bin/emacs-%%EMACS_VER%% bin/emacsclient bin/etags bin/grep-changelog +man/man1/emacs.1.gz +man/man1/ctags.1.gz +man/man1/etags.1.gz +man/man1/grep-changelog.1.gz +man/man1/emacsclient.1.gz +man/man1/ebrowse.1.gz share/applications/emacs.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el %%DATADIR%%/site-lisp/subdirs.el +%%INFODIR%%/dir share/icons/hicolor/128x128/apps/emacs.png share/icons/hicolor/16x16/apps/emacs.png share/icons/hicolor/24x24/apps/emacs.png @@ -16,6 +23,7 @@ share/icons/hicolor/32x32/apps/emacs.png share/icons/hicolor/48x48/apps/emacs.png share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg +@dirrm %%INFODIR%% @dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp @dirrmtry share/icons/hicolor/scalable/mimetypes @dirrmtry share/icons/hicolor/scalable/apps