ports/179455: [PATCH] editors/vim: legalize devel/libsysinfo link

[Oleg A. Mamontov]

>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 at 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 <bsd.port.options.mk>
 
-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: