From owner-svn-ports-all@FreeBSD.ORG Tue Apr 22 11:21:13 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 630931E6; Tue, 22 Apr 2014 11:21: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 501331853; Tue, 22 Apr 2014 11:21:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3MBLDDC088567; Tue, 22 Apr 2014 11:21:13 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3MBLDAB088566; Tue, 22 Apr 2014 11:21:13 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201404221121.s3MBLDAB088566@svn.freebsd.org> From: Ashish SHUKLA Date: Tue, 22 Apr 2014 11:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351809 - head/editors/emacs 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: Tue, 22 Apr 2014 11:21:13 -0000 Author: ashish Date: Tue Apr 22 11:21:12 2014 New Revision: 351809 URL: http://svnweb.freebsd.org/changeset/ports/351809 QAT: https://qat.redports.org/buildarchive/r351809/ Log: - Fix CONFLICTS to silence portlint warnings - Add 'USES=shebangfix' to fix perl path of grep-changelog.[1][2] - Convert 'USE_XZ' to 'USES=tar.xz'.[1][2] - Convert to new LIB_DEPENDS format.[1][2] - Remove deprecated and needless MAN1 setting.[1][2] PR: ports/188583[1], ports/188720[2] Submitted by: swills[1], Yasuhiro KIMURA [2] Modified: head/editors/emacs/Makefile Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Tue Apr 22 10:56:49 2014 (r351808) +++ head/editors/emacs/Makefile Tue Apr 22 11:21:12 2014 (r351809) @@ -21,23 +21,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_SAFE= yes -CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ +CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ - emacs-devel-* + emacs-devel-[0-9]* EMACS_VER= 24.3 GNU_CONFIGURE= yes -USES= ncurses gmake pkgconfig -USE_XZ= yes +USES= ncurses gmake pkgconfig shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO_PATH= ${DATADIR_REL}/info CONFIGURE_ARGS= --localstatedir=/var --without-compress-info WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +SHEBANG_FILES= lib-src/grep-changelog -MAN1= ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ - grep-changelog.1 PLIST_SUB= EMACS_VER=${EMACS_VER} INFODIR=${INFO_PATH} EMACS_DIRS= ${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ @@ -86,14 +84,14 @@ CANNA_CONFIGURE_ON= --with-canna \ --with-canna-libraries=${LOCALBASE}/lib CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL} CANNA_PATCHFILES= emacs24.3canna-20130321.diff.gz -CANNA_LIB_DEPENDS= canna:${PORTSDIR}/japanese/canna-lib +CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib SOUND_CONFIGURE_WITH= sound -DBUS_LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus -GNUTLS_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls XML_USE= GNOME=libxml2 @@ -108,7 +106,7 @@ GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 -XAW3D_LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw @@ -121,32 +119,32 @@ SCROLLBARS_CONFIGURE_WITH= toolkit-scrol SYNC_INPUT_CONFIGURE_WITH= sync-input -JPEG_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg JPEG_CONFIGURE_WITH= jpeg -TIFF_LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff +TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TIFF_CONFIGURE_WITH= tiff -GIF_LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CONFIGURE_WITH= gif -PNG_LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +PNG_LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_WITH= png XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XFT_USE= XORG=xft -XFT_LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 +XFT_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 XFT_CONFIGURE_WITH= xft -M17N_LIB_DEPENDS= m17n:${PORTSDIR}/devel/m17n-lib +M17N_LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt -OTF_LIB_DEPENDS= otf:${PORTSDIR}/print/libotf +OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf -MAGICK_LIB_DEPENDS= MagickCore:${PORTSDIR}/graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20