From owner-freebsd-ports@FreeBSD.ORG Sun Nov 21 18:41:21 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C40416A4CE; Sun, 21 Nov 2004 18:41:21 +0000 (GMT) Received: from smtp1.jazztel.es (smtp1.jazztel.es [62.14.3.161]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB68E43D1D; Sun, 21 Nov 2004 18:41:19 +0000 (GMT) (envelope-from josemi@freebsd.jazztel.es) Received: from antivirus by smtp1.jazztel.es with antivirus id 1CVweW-0001Zm-00 Sun, 21 Nov 2004 19:41:36 +0100 Received: from [212.106.237.232] (helo=rguez.homeunix.net) by smtp1.jazztel.es with esmtp id 1CVweV-0001ZW-00 Sun, 21 Nov 2004 19:41:35 +0100 Received: from redesjm.local (orion.redesjm.local [192.168.254.16]) by rguez.homeunix.net (8.13.1/8.13.1) with ESMTP id iALIfH0c069121; Sun, 21 Nov 2004 19:41:17 +0100 (CET) (envelope-from freebsd@redesjm.local) Received: from localhost (localhost [[UNIX: localhost]]) by redesjm.local (8.13.1/8.13.1/Submit) id iALIfFm0042245; Sun, 21 Nov 2004 19:41:16 +0100 (CET) (envelope-from freebsd@redesjm.local) From: Jose M Rodriguez To: obrien@freebsd.org Date: Sun, 21 Nov 2004 19:41:14 +0100 User-Agent: KMail/1.7.1 References: <41A01DF9.9090607@sc.rr.com> <1101013587.10885.21.camel@hood.oook.cz> <20041121172706.GA26536@dragon.nuxi.com> In-Reply-To: <20041121172706.GA26536@dragon.nuxi.com> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_LFOoB9aPBsejw45" Message-Id: <200411211941.15515.freebsd@redesjm.local> X-AntiVirus: checked by AntiVir Milter (version: 1.1; AVE: 6.28.0.12; VDF: 6.28.0.76; host: antares.redesjm.local) X-Virus-Scanned: by antivirus cc: freebsd-ports@freebsd.org Subject: Re: FreeBSD Port: vim-lite-6.3.16 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Nov 2004 18:41:21 -0000 --Boundary-00=_LFOoB9aPBsejw45 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline El Domingo, 21 de Noviembre de 2004 18:27, David O'Brien escribi=F3: cp> On Sun, Nov 21, 2004 at 06:06:27AM +0100, Pav Lucistnik wrote: > > William Allison p??e v so 20. 11. 2004 v 23:47 -0500: > > > I'm sorry but I can't seem to figure this out and haven't been > > > able to get help on IRC. > > [ ... ] > > I would more than welcome a patch for a tested vim-gtk (or vim-gtk2) > slave port[*] that I could review and test. > I use this locally for weeks --Boundary-00=_LFOoB9aPBsejw45 Content-Type: text/x-diff; charset="iso-8859-1"; name="patch-vim" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-vim" diff -Nru /usr/ports/editors/vim/Makefile editors/vim/Makefile --- /usr/ports/editors/vim/Makefile Fri Aug 27 19:50:32 2004 +++ editors/vim/Makefile Fri Oct 1 19:51:11 2004 @@ -7,44 +7,65 @@ # PORTNAME?= vim -PATCHLEVEL= 16 +PATCHLEVEL= 28 PORTVERSION= 6.3.${PATCHLEVEL} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= ${MASTER_SITE_VIM} DISTNAME= vim-${PORTVERSION:C/\.[0-9a-z]*$//} +MAINTAINER?= obrien@FreeBSD.org +COMMENT?= Vi "workalike", with many additional features -PATCH_SITES= ${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|} +.if defined(WITH_I18N) || defined(WITH_EXTRA) +MASTER_SITES+= ${MASTER_SITE_VIM:S/unix\/$/extra\/:vim_extra/} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +.endif + +PATCH_SITES= ${MASTER_SITES:S|unix/$|patches/${PORTVERSION:C/\.[0-9a-z]*$//}/|} PATCHFILES!= /usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d \ ${PATCHLEVEL} 1 ${PATCHLEVEL} -# bits to remove +# bits to remove and extras BADPATCHES= 000 + +.if defined(WITH_EXTRA) +EXTRA_FILE= ${DISTNAME}-extra.tar.gz +DISTFILES+= ${EXTRA_FILE}:vim_extra +.else +# badpatches by missing EXTRA_FILE +BADPATCHES+= 022 025 +.endif + +.if defined(WITH_I18N) +LANG_FILE= ${DISTNAME}-lang.tar.gz +DISTFILES+= ${LANG_FILE}:vim_extra +USE_GETTEXT= yes +.else +# badpatches by missing LANG_FILE +.endif + .for p in ${BADPATCHES} PATCHFILES:= ${PATCHFILES:N6.3.${p}} .endfor -MAINTAINER?= obrien@FreeBSD.org -COMMENT?= Vi "workalike", with many additional features - -SLAVEDIRS= editors/vim-lite +SLAVEDIRS= editors/vim-lite editors/vim-gtk2 .if defined(PACKAGE_BUILDING) && !defined(LITE) -WITH_TCL= yes WITH_PERL= yes -WITH_PYTHON= yes WITH_CSCOPE= yes +WITH_I18N= yes .endif USE_BZIP2= yes USE_REINPLACE= yes DIST_SUBDIR= vim WRKSRC= ${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src -PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP} +PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP} # consider #PATCH_DIST_ARGS= -t MAKE_ARGS+= CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}" ALL_TARGET= # -_DATADIR= ${DISTNAME:S/-//g:S/.//g} +_DATADIR= vim${PORTVERSION:C/\.[0-9]*$//:S/.//g} DATADIR= ${PREFIX}/share/vim/${_DATADIR} PLIST_SUB= VIM_VER=${_DATADIR} MAN1= evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1 @@ -134,6 +155,18 @@ .if exists(${PREFIX}/lib/libiconv.so) USE_ICONV= yes +.endif + +post-extract: + +.if defined(WITH_EXTRA) + @${ECHO_MSG} ">>> extracting ${EXTRA_FILE} ..." + @${TAR} -C ${WRKDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTRA_FILE} +.endif + +.if defined(WITH_I18N) + @${ECHO_MSG} ">>> extracting ${LANG_FILE} ..." + @${TAR} -C ${WRKDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LANG_FILE} .endif pre-configure: diff -Nru /usr/ports/editors/vim/distinfo editors/vim/distinfo --- /usr/ports/editors/vim/distinfo Fri Aug 27 19:50:32 2004 +++ editors/vim/distinfo Fri Oct 1 19:45:14 2004 @@ -1,5 +1,9 @@ MD5 (vim/vim-6.3.tar.bz2) = 821fda8f14d674346b87e3ef9cb96389 SIZE (vim/vim-6.3.tar.bz2) = 3699397 +MD5 (vim/vim-6.3-extra.tar.gz) = 6e4bd6c8122bcb9dc576514bdb52484e +SIZE (vim/vim-6.3-extra.tar.gz) = 868609 +MD5 (vim/vim-6.3-lang.tar.gz) = 5395c4dacbf1c5008b22c4b86794e8a7 +SIZE (vim/vim-6.3-lang.tar.gz) = 1057792 MD5 (vim/6.3.001) = 798fc87d3ebc06e7f104ff30960a4630 SIZE (vim/6.3.001) = 2672 MD5 (vim/6.3.002) = 039c3f84677116a20ad98e09a03d827d @@ -32,3 +36,27 @@ SIZE (vim/6.3.015) = 1207 MD5 (vim/6.3.016) = 2f58e8b00f4614c2b071838d299310b6 SIZE (vim/6.3.016) = 1735 +MD5 (vim/6.3.017) = 821323cc5cdefbc69899e6bc8b30bc30 +SIZE (vim/6.3.017) = 1364 +MD5 (vim/6.3.018) = 735e869f92d6c80c6d43c837dee670b3 +SIZE (vim/6.3.018) = 1844 +MD5 (vim/6.3.019) = f6885686d11cd7f794805a70ee849579 +SIZE (vim/6.3.019) = 1992 +MD5 (vim/6.3.020) = e51adda32a4a1a73dff2e92b3715b1ef +SIZE (vim/6.3.020) = 1915 +MD5 (vim/6.3.021) = 559410e68495eed2fd05e65533b03aa8 +SIZE (vim/6.3.021) = 2822 +MD5 (vim/6.3.022) = 7f5bdfd30410e22776711a49404583b3 +SIZE (vim/6.3.022) = 2173 +MD5 (vim/6.3.023) = 2f460f5691c31d14354f5ca20536b6f1 +SIZE (vim/6.3.023) = 6419 +MD5 (vim/6.3.024) = e3e1f86a74242731d93a009cb692f952 +SIZE (vim/6.3.024) = 2456 +MD5 (vim/6.3.025) = f45faa33e3ccc853f0fae4f76421bb1f +SIZE (vim/6.3.025) = 1409 +MD5 (vim/6.3.026) = 30c225d5ee55b073eec23037969edb48 +SIZE (vim/6.3.026) = 3070 +MD5 (vim/6.3.027) = c6f122ba3c95d03f835842d05d66c3bd +SIZE (vim/6.3.027) = 7500 +MD5 (vim/6.3.028) = 11c22371c8ca2e3588f894bba8c5409f +SIZE (vim/6.3.028) = 2128 diff -Nru /usr/ports/editors/vimpart/Makefile editors/vimpart/Makefile --- /usr/ports/editors/vimpart/Makefile Mon Aug 30 21:55:12 2004 +++ editors/vimpart/Makefile Sat Oct 2 16:15:03 2004 @@ -32,8 +32,6 @@ .include "${.CURDIR}/../../misc/kdeaddons3/Makefile.split" .include -.if exists(${LOCALBASE}/bin/gvim) -RUN_DEPENDS+= gvim:${PORTSDIR}/editors/vim -.endif +RUN_DEPENDS+= gvim:${PORTSDIR}/editors/vim-gtk2 .include --- /dev/null Sat Oct 2 16:11:00 2004 +++ editors/vim-gtk2/Makefile Fri Oct 1 19:50:39 2004 @@ -0,0 +1,19 @@ +# ex:ts=8 +# Ports collection makefile for: vim-lite +# Date created: Fri Jun 25, 1999 +# Whom: David O'Brien (obrien@NUXI.com) +# +# $FreeBSD: ports/editors/vim-lite/Makefile,v 1.14 2003/02/18 19:08:21 knu Exp $ +# + +WITH_GTK2= yes +WITH_I18N= yes +WITH_PERL= yes +WITH_CSCOPE= yes + +MASTERDIR= ${.CURDIR}/../vim + +MAINTAINER?= obrien@FreeBSD.org +COMMENT?= Vi "workalike", with many additional features (Lite package) + +.include "${MASTERDIR}/Makefile" --Boundary-00=_LFOoB9aPBsejw45--