Date: Sun, 8 Oct 2006 19:32:41 +0800 (CST) From: Rong-En Fan <rafan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obrien@FreeBSD.org Subject: ports/104156: [PATCH] editors/vim: WITH_ICONV knob, some portlint(1) cleanup Message-ID: <200610081132.k98BWfn6060067@svm.csie.ntu.edu.tw> Resent-Message-ID: <200610081140.k98BeKa8010335@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104156
>Category: ports
>Synopsis: [PATCH] editors/vim: WITH_ICONV knob, some portlint(1) cleanup
>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: Sun Oct 08 11:40:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rong-En Fan
>Release: FreeBSD 6.2-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
- Add know WITH_ICONV to define USE_ICONV
The current behavior is to auto-detect. However, some users, especially
CJK ones, need convert between different encoding in vim. Thus iconv
support is necessary for them. This know allow users to force vim
to be compiled with iconv support instead of auto-detect.
- Some portlint(1) cleanup
Port maintainer (obrien@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- vim-7.0.94.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/editors/vim/Makefile,v
retrieving revision 1.284
diff -u -u -r1.284 Makefile
--- Makefile 10 Sep 2006 02:44:18 -0000 1.284
+++ Makefile 8 Oct 2006 11:30:34 -0000
@@ -38,7 +38,7 @@
USE_BZIP2= 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}"
@@ -133,7 +133,7 @@
MAKE_ARGS+= CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp"
.endif # LITE
-.if exists(${PREFIX}/lib/libiconv.so)
+.if exists(${PREFIX}/lib/libiconv.so) || defined(WITH_ICONV)
USE_ICONV= yes
.endif
@@ -144,10 +144,10 @@
s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
s|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/auto/configure
-.if defined(WITH_XTERM_SAVE)
- @${REINPLACE_CMD} -e ' \
+.if defined(WITH_XTERM_SAVE)
+ @${REINPLACE_CMD} -e ' \
s|/\* #define FEAT_XTERM_SAVE \*/|#define FEAT_XTERM_SAVE|g' \
- ${WRKSRC}/feature.h
+ ${WRKSRC}/feature.h
.endif
# Clean up junk files to keep them from being installed.
@@ -190,7 +190,7 @@
| fgrep ${PORTVERSION:C/[0-9]*$//} | ${TAIL}
find-bad-patches:
- cd ${DISTDIR} ; egrep -l \
+ cd ${DISTDIR} ; ${EGREP} -l \
'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_(riscos|cyg|os2|vms))'\
vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
--- vim-7.0.94.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610081132.k98BWfn6060067>