Date: Tue, 1 Nov 2005 12:33:22 +0100 (CET) From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obrien@FreeBSD.org Subject: ports/88316: [PATH] add extra tarballs to vim and patch 6.4.001 Message-ID: <200511011133.jA1BXMB2098023@redesjm.local> Resent-Message-ID: <200511011040.jA1AeFZC052107@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88316
>Category: ports
>Synopsis: [PATH] add extra tarballs to vim and patch 6.4.001
>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: Tue Nov 01 10:40:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jose M Rodriguez
>Release: FreeBSD 5.4-RELEASE-p8 i386
>Organization:
Redes JM
>Environment:
System: FreeBSD orion.redesjm.local 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #0: Thu Oct 13 00:20:53 CEST 2005 root@orion.redesjm.local:/usr/obj/usr/src/sys/ORION i386
>Description:
This patch add support to the aditional tarballs out of the unix
one to complete the full vim source.
Allthoug the main target is add I18N support to vim graphical builds,
I take also support to extra code for:
- fullfill the vim src
- permit working on unix-aware src on extra tarball like
vim & eclipse integration code.
This patch comes also with support to the patchlevel == 0 problem and
a cosmetic fix to the MASTER_SITE_VIM related sed code
(math only ending unix).
Also, added support for first vim-6.4 patch [extra]
>How-To-Repeat:
>Fix:
--- patch-vim begins here ---
Index: editors/vim/Makefile
===================================================================
RCS file: /home/cvs/freebsd/ports/editors/vim/Makefile,v
retrieving revision 1.269
diff -u -r1.269 Makefile
--- editors/vim/Makefile 24 Oct 2005 09:43:26 -0000 1.269
+++ editors/vim/Makefile 1 Nov 2005 10:12:36 -0000
@@ -7,22 +7,13 @@
#
PORTNAME?= vim
-PATCHLEVEL= 0
+PATCHLEVEL= 1
PORTVERSION= 6.4.${PATCHLEVEL}
PORTREVISION?= 0
CATEGORIES?= editors
MASTER_SITES= ${MASTER_SITE_VIM}
DISTNAME= vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-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
-BADPATCHES= 000
-#.for p in ${BADPATCHES}
-#PATCHFILES:= ${PATCHFILES:N6.4.${p}}
-#.endfor
-
MAINTAINER?= obrien@FreeBSD.org
COMMENT?= Vi "workalike", with many additional features
@@ -35,6 +26,42 @@
WITH_CSCOPE= yes
.endif
+.if defined(WITH_EXTRA) || defined(WITH_I18N)
+MASTER_SITES+= ${MASTER_SITE_VIM:S/unix\/$/extra\/:vim_extra/}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+.endif
+
+.if ${PATCHLEVEL} > 0
+PATCH_SITES= ${MASTER_SITE_VIM:S|unix/$|patches/${PORTVERSION:C/\.[0-9a-z]*$//}/|}
+PATCHFILES!= /usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d \
+ ${PATCHLEVEL} 1 ${PATCHLEVEL}
+BADPATCHES= 000
+.endif
+
+.if defined(WITH_EXTRA)
+EXTRA_FILE= ${DISTNAME}-extra.tar.gz
+DISTFILES+= ${EXTRA_FILE}:vim_extra
+.elif ${PATCHLEVEL} > 0
+# badpatches by missing EXTRA_FILE
+BADPATCHES+= 001
+.endif
+
+.if defined(WITH_I18N)
+LANG_FILE= ${DISTNAME}-lang.tar.gz
+DISTFILES+= ${LANG_FILE}:vim_extra
+USE_GETTEXT= yes
+.elif ${PATCHLEVEL} > 0
+# badpatches by missing LANG_FILE
+#BADPATCHES+=
+.endif
+
+.if ${PATCHLEVEL} > 0
+.for p in ${BADPATCHES}
+PATCHFILES:= ${PATCHFILES:N6.4.${p}}
+.endfor
+.endif
+
USE_BZIP2= yes
USE_REINPLACE= yes
DIST_SUBDIR= vim
@@ -136,6 +163,16 @@
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:
@(cd ${WRKSRC} ; ${MAKE} distclean)
@${REINPLACE_CMD} -e ' \
Index: editors/vim/distinfo
===================================================================
RCS file: /home/cvs/freebsd/ports/editors/vim/distinfo,v
retrieving revision 1.159
diff -u -r1.159 distinfo
--- editors/vim/distinfo 24 Oct 2005 01:28:48 -0000 1.159
+++ editors/vim/distinfo 1 Nov 2005 10:13:25 -0000
@@ -1,2 +1,8 @@
MD5 (vim/vim-6.4.tar.bz2) = 774c14d93ce58674b3b2c880edd12d77
SIZE (vim/vim-6.4.tar.bz2) = 3737338
+MD5 (vim/vim-6.4-extra.tar.gz) = 5f4489776cafcb3588223f79eb26e287
+SIZE (vim/vim-6.4-extra.tar.gz) = 885991
+MD5 (vim/vim-6.4-lang.tar.gz) = 3cca6128fe5439e89d3828b5e708bddb
+SIZE (vim/vim-6.4-lang.tar.gz) = 1118790
+MD5 (vim/6.4.001) = a5a8ca3671846d33f454fc765644d129
+SIZE (vim/6.4.001) = 1705
--- patch-vim ends here ---
--
This mail was scanned by AntiVir Milter.
This product is licensed for non-commercial use.
See www.antivir.de for details.
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511011133.jA1BXMB2098023>