From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 10 15:00:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8E93CD94 for ; Mon, 10 Jun 2013 15:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6FBBC1D37 for ; Mon, 10 Jun 2013 15:00:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AF01gG045498 for ; Mon, 10 Jun 2013 15:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r5AF011Z045497; Mon, 10 Jun 2013 15:00:01 GMT (envelope-from gnats) Resent-Date: Mon, 10 Jun 2013 15:00:01 GMT Resent-Message-Id: <201306101500.r5AF011Z045497@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Oleg A. Mamontov" Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5FBDCC2C; Mon, 10 Jun 2013 14:53:01 +0000 (UTC) (envelope-from lonerr@lb1.lamoda.ru) Received: from lb1.lamoda.ru (lb1.lamoda.ru [87.245.139.4]) by mx1.freebsd.org (Postfix) with ESMTP id 1DC251CEF; Mon, 10 Jun 2013 14:53:00 +0000 (UTC) Received: from lonerr by lb1.lamoda.ru with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1Um3St-000N9n-1m; Mon, 10 Jun 2013 18:52:59 +0400 Message-Id: Date: Mon, 10 Jun 2013 18:52:59 +0400 From: "Oleg A. Mamontov" Sender: Oleg Mamontov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/179455: [PATCH] editors/vim: legalize devel/libsysinfo link Cc: obrien@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 15:00:02 -0000 >Number: 179455 >Category: ports >Synopsis: [PATCH] editors/vim: legalize devel/libsysinfo link >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 10 15:00:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Oleg A. Mamontov >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD lonerr.jail.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 >Description: devel/libsysinfo broken dependency was fixed at r320219. Now we can remove vim conflicts with it and restore usage of this library. Port maintainer (obrien@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- vim-7.3.1014_1.patch begins here --- diff -ruN ../vim.orig/Makefile ./Makefile --- ../vim.orig/Makefile 2013-06-10 13:48:59.845058000 +0400 +++ ./Makefile 2013-06-10 18:45:16.230054556 +0400 @@ -8,7 +8,7 @@ PATCHLEVEL= 1014 PORTVERSION= 7.3.${PATCHLEVEL} RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= ${MASTER_SITE_VIM} DISTFILES= ${RELEASE}${EXTRACT_SUFX} @@ -54,7 +54,7 @@ .endif .include -CONFLICTS= vim6* vim*-gnome libsysinfo +CONFLICTS= vim6* vim*-gnome .if defined(LITE) CONFLICTS+= vim* .else @@ -68,7 +68,7 @@ # consider #PATCH_DIST_ARGS= -t REINPLACE_ARGS= -i "" -MAKE_ARGS+= CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}" +MAKE_ARGS+= CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}" EXTRA_LIBS+=-lsysinfo ALL_TARGET= # _DATADIR= ${RELEASE:S/-//g:S/.//g} DATADIR= ${PREFIX}/share/vim/${_DATADIR} @@ -118,6 +118,8 @@ WANT_GNOME= yes +LIB_DEPENDS+= sysinfo:${PORTSDIR}/devel/libsysinfo + .if defined(LITE) PKGNAMESUFFIX= -lite CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte" @@ -201,7 +203,6 @@ post-configure: @(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} scratch config) - ${REINPLACE_CMD} -e 's@#define HAVE_SYSINFO 1@/* #undef HAVE_SYSINFO */@' ${WRKSRC}/auto/config.h # Clean up junk files to keep them from being installed. pre-install: --- vim-7.3.1014_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: