Permalink
Browse files

Attempt to fix editors/vim on 10.x

  • Loading branch information...
1 parent d9a71b8 commit dc908548c32a2d31e3c438aaef53465aee23ea07 @kmoore134 kmoore134 committed Oct 17, 2013
@@ -127,7 +127,3 @@ dovecot_SET=MYSQL PGSQL SQLITE LDAP
# Add some default options to postfix
postfix_SET=MYSQL TLS
-
-# Enable GUI for VIM
-vim_SET=GTK2
-vim-lite_SET=GTK2
@@ -0,0 +1,308 @@
+# Created by: David O'Brien <obrien@cs.ucdavis.edu>
+# $FreeBSD: editors/vim/Makefile 328318 2013-09-25 21:16:43Z obrien $
+
+PORTNAME?= vim
+# ! _NEVER_ reduce or lower PATCHLEVEL, even if the PATCHLEVEL
+# ! value # is added to BADPATCHES. Doing otherwise will cause
+# ! PORTEPOCH to be needed, which we do NOT want.
+#
+# ! DO NOT increase PATCHLEVEL to a patch listed in BADPATCHES.
+# ! Doing so is dis-genuine. It implies we're at a level we are
+# ! not. The "PATCHLEVEL" patch needs to apply before bumping
+# ! PATCHLEVEL to that level.
+PATCHLEVEL= 1314
+PORTVERSION= 7.3.${PATCHLEVEL}
+RELEASE= vim-${PORTVERSION:C/\.[0-9a-z]*$//}
+PORTREVISION?= 0
+CATEGORIES?= editors
+MASTER_SITES= ${MASTER_SITE_VIM}
+DISTFILES= ${RELEASE}${EXTRACT_SUFX}
+
+PATCH_SITES= ${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|}\
+ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/obrien/:local
+PATCHFILES!= /usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d \
+ ${PATCHLEVEL} 1 ${PATCHLEVEL}
+# bits to remove
+BADPATCHES= 527 780 796 873 890 1104 1111
+.for p in ${BADPATCHES}
+PATCHFILES:= ${PATCHFILES:N7.3.${p}}
+.endfor
+
+MAINTAINER?= obrien@FreeBSD.org
+COMMENT?= Vi "workalike", with many additional features
+
+WITH_GCC= 4.2
+SLAVEDIRS= editors/vim-lite
+NO_STAGE= yes
+
+.if !defined(LITE)
+.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS)
+.include "${.CURDIR}/../vim/options"
+OPTIONS_DEFAULT+= CSCOPE EXUBERANT_CTAGS PERL PYTHON RUBY \
+ TCL LUA X11 GTK2
+.else
+VIM_PORT_SCRIPT_LANGS?= LUA PERL PYTHON RUBY TCL
+VIM_PORT_OPTIONS= CSCOPE DOCS EXAMPLES EXUBERANT_CTAGS \
+ ${VIM_PORT_SCRIPT_LANGS}
+PORT_OPTIONS?= ${VIM_PORT_OPTIONS}
+.endif
+.endif
+
+.include <bsd.port.options.mk>
+
+CONFLICTS= vim6* vim*-gnome
+.if defined(LITE)
+CONFLICTS+= vim*
+.else
+CONFLICTS+= vim*-lite
+.endif
+
+MAKE_JOBS_UNSAFE= yes
+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}
+# consider
+#PATCH_DIST_ARGS= -t
+REINPLACE_ARGS= -i ""
+MAKE_ARGS+= CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
+ALL_TARGET= #
+_DATADIR= ${RELEASE:S/-//g:S/.//g}
+DATADIR= ${PREFIX}/share/vim/${_DATADIR}
+PLIST_SUB= VIM_VER=${_DATADIR}
+MAN1= evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
+MLINKS= vim.1 rvim.1 vim.1 rview.1
+.if !defined(LITE)
+MLINKS+= vim.1 gvim.1 vim.1 gview.1 vimdiff.1 gvimdiff.1 \
+ vim.1 rgvim.1 vim.1 rgview.1 evim.1 eview.1
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+MANLANG= "" ru.KOI8-R ru.UTF-8 pl.ISO8859-2 pl.UTF-8 pl fr.ISO8859-1 \
+ fr.UTF-8 fr it.ISO8859-1 it.UTF-8 it
+USES+= gettext
+PLIST_SUB+= NLS=""
+.else
+MAKE_ARGS+= CONF_OPT_NLS="--disable-nls"
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+USE_PYTHON= yes
+MAKE_ARGS+= CONF_OPT_PYTHON="--enable-pythoninterp"
+.endif
+
+.if ${PORT_OPTIONS:MRUBY}
+USE_RUBY= yes
+MAKE_ARGS+= CONF_OPT_RUBY="--enable-rubyinterp"
+.endif
+
+.if ${PORT_OPTIONS:MTCL}
+USE_TCL= 85+
+MAKE_ARGS+= CONF_OPT_TCL="--enable-tclinterp --with-tclsh="${TCLSH:S/${LOCALBASE}\/bin\///g}""
+.endif
+
+.if ${PORT_OPTIONS:MLUA}
+USE_LUA= yes
+MAKE_ARGS+= CONF_OPT_LUA="--enable-luainterp=dynamic"
+MAKE_ARGS+= CONF_OPT_LUA_PREFIX="--with-lua-prefix=${LOCALBASE}"
+.endif
+
+.if ${PORT_OPTIONS:MPERL}
+USES= perl5
+MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp"
+.endif
+
+WANT_GNOME= yes
+
+.if defined(LITE)
+PKGNAMESUFFIX= -lite
+CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
+MAKE_ARGS+= CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp --disable-luainterp"
+.else # !LITE
+MAKE_ARGS+= CONF_OPT_FEAT="--with-features=big"
+I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
+CONF_OPT_GUI="--enable-gui=no --without-x"
+.endif
+
+.if ${PORT_OPTIONS:MCSCOPE}
+RUN_DEPENDS+= cscope:${PORTSDIR}/devel/cscope
+MAKE_ARGS+= CONF_OPT_CSCOPE="--enable-cscope"
+.endif
+
+.if ${PORT_OPTIONS:MEXUBERANT_CTAGS}
+RUN_DEPENDS+= exctags:${PORTSDIR}/devel/ctags
+CTAGS_CMD= exctags -R .
+.else
+CTAGS_CMD= ${FIND} . -type f \\|${XARGS} ctags
+.endif
+
+.if ${PORT_OPTIONS:MX11}
+CONF_OPT_GUI="--enable-gui=no --with-x"
+
+. if ${PORT_OPTIONS:MATHENA}
+CONF_OPT_GUI="--enable-gui=athena"
+USE_XORG+= xaw
+. endif
+
+. if ${PORT_OPTIONS:MGTK2}
+USE_GNOME= gtk20
+CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}"
+MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt
+. endif
+
+. if ${PORT_OPTIONS:MGNOME}
+USE_GNOME= libgnomeui
+PKGNAMESUFFIX= -gnome2
+CONF_OPT_GUI="--enable-gui=gnome2"
+MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
+USE_XORG+= xt glproto
+. endif
+
+. if ${PORT_OPTIONS:MMOTIF}
+USES+= motif
+CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\""
+MAKE_ARGS+= MOTIFHOME=${LOCALBASE}
+. endif
+
+.endif
+MAKE_ARGS+= CONF_OPT_GUI=${CONF_OPT_GUI} ${I18N}
+
+
+.if exists(${LOCALBASE}/lib/libiconv.so)
+USES+= iconv
+.endif
+
+
+post-patch:
+ @(${FIND} ${WRKSRC}/../runtime/ -name menu\*.vim -print0 | ${XARGS} -0 \
+ ${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g')
+.if !defined(STRIP) || ${STRIP} == ""
+ ${REINPLACE_CMD} '/$$(STRIP)/d' ${WRKSRC}/Makefile
+.endif
+
+pre-configure:
+ @${CP} -pv ${WRKSRC}/config.mk.dist ${WRKSRC}/auto/config.mk
+ @(cd ${WRKSRC} ; ${MAKE} distclean)
+ @${REINPLACE_CMD} -e ' \
+ s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
+ s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
+ s|/usr/local|${LOCALBASE}|g; \
+ s|set dummy lua;|set dummy lua-${LUA_VER};|g' \
+ ${WRKSRC}/auto/configure
+.if ${PORT_OPTIONS:MXTERM_SAVE}
+ @${REINPLACE_CMD} -e ' \
+ s|/\* #define FEAT_XTERM_SAVE \*/|#define FEAT_XTERM_SAVE|g' \
+ ${WRKSRC}/feature.h
+.endif
+
+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:
+ @${FIND} ${WRKSRC:H} -type f -name '*.orig' -delete
+
+post-install:
+ [ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim)
+ # below needed for `vim-lite' port
+ ${TEST} -e ${PREFIX}/bin/rgvim || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
+ ${TEST} -e ${PREFIX}/bin/gview || (cd ${PREFIX}/bin ; ${LN} -sf vim gview)
+ ${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -sf vim rgview)
+ ${TEST} -e ${PREFIX}/bin/evim || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
+ ${TEST} -e ${PREFIX}/bin/eview || (cd ${PREFIX}/bin ; ${LN} -sf vim eview)
+ ${TEST} -e ${PREFIX}/bin/gvimdiff \
+ || (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
+ ${TEST} -e ${PREFIX}/bin/gvimtutor \
+ || (cd ${PREFIX}/bin ; ${LN} -sf vimtutor gvimtutor)
+ ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
+ cd ${PREFIX} ; \
+ ${FIND} share/vim/${_DATADIR} -type f -o -type l \
+ | ${SORT} \
+ >${WRKDIR}/PLIST.share-vim
+ cd ${PREFIX} ; \
+ ${FIND} share/vim/${_DATADIR} -type d \
+ | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
+ >>${WRKDIR}/PLIST.share-vim
+ ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
+ ${ECHO_CMD} "/Insert PLIST.share-vim" >> ${WRKDIR}/ex.script
+ ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
+ ${ECHO_CMD} "r ${WRKDIR}/PLIST.share-vim" >> ${WRKDIR}/ex.script
+ ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
+ ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim
+ cd ${WRKDIR} ; ex < ex.script
+
+show-options:
+ @${MAKE} -DWITH_OPTIONS showconfig
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "Put \"WITH_OPTIONS=yes\" -or- \"WITH_VIM_OPTIONS=yes\""
+ @${ECHO_CMD} "in your /etc/make.conf or /etc/ports.conf file to enable OPTIONS processing.
+
+.if defined(ONT_CHECKSUM)
+checksum:
+.endif
+
+cklatest: .PHONY
+ @${ECHO} -n "Currently at: "
+ @${MAKE} -V PATCHLEVEL
+ -(${SED} -i '' "s/^PATCHLEVEL=.*$$/PATCHLEVEL= `ncftpls \
+ ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \
+ | grep "^${PORTVERSION:C/\.[0-9a-z]*$//}" \
+ | ${SED} -n -E -e 's/${PORTVERSION:C/[0-9]*$//}([0-9]+)$$/\1/p' \
+ | sort -n | ${TAIL} -1`/" Makefile)
+ @${ECHO} -n "Now at: "
+ @${MAKE} -V PATCHLEVEL
+
+find-bad-patches:
+ @cd ${DISTDIR} ; egrep -l \
+ '(src/if_(ole|mzsch)|src/gui_(w32|w48|mac)|src/os_(riscos|cyg|os2|vms|amiga|win32|mswin))|src(/testdir)?/Make_(dos|cyg|vms|mvc|ming|os2|amiga|mms)'\
+ vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
+
+ckp:
+ /usr/bin/time -h ${MAKE} -DPATCH_DEBUG -DONT_CHECKSUM clean patch
+
+ckmtree:
+ ${MTREE_CMD} -f ${MTREE_FILE} -p ${PREFIX}
+
+do-patch:
+ @${ECHO_MSG} "===> Applying distribution patches for ${PKGNAME} from `pwd`"
+ @set -e ; \
+ (cd ${_DISTDIR} ; \
+ for i in ${_PATCHFILES}; do \
+ if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+ ${ECHO_MSG} "===> Applying distribution patch $$i" ; \
+ fi ; \
+ ${PATCH} ${PATCH_DIST_ARGS} -i ${_DISTDIR}/$$i; \
+ done )
+ @set -e ;\
+ if [ -d ${PATCHDIR} ]; then \
+ if [ "`${ECHO_CMD} ${PATCHDIR}/patch-*`" != "${PATCHDIR}/patch-*" ]; then \
+ ${ECHO_MSG} "===> Applying ${OPSYS} patches for ${PKGNAME}" ; \
+ PATCHES_APPLIED="" ; \
+ for i in ${PATCHDIR}/patch-*; do \
+ case $$i in \
+ *.orig|*.rej|*~|*,v) \
+ ${ECHO_MSG} "===> Ignoring patchfile $$i" ; \
+ ;; \
+ *) \
+ if [ ${PATCH_DEBUG_TMP} = yes ]; then \
+ ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ; \
+ fi; \
+ if ${PATCH} ${PATCH_ARGS} < $$i ; then \
+ PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
+ else \
+ ${ECHO_MSG} `${ECHO_CMD} "=> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \
+ if [ x"$$PATCHES_APPLIED" != x"" ]; then \
+ ${ECHO_MSG} `${ECHO_CMD} "=> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \
+ fi; \
+ ${FALSE} ; \
+ fi; \
+ ;; \
+ esac; \
+ done; \
+ fi; \
+ fi
+
+.include <bsd.port.mk>
@@ -0,0 +1,12 @@
+:
+# $FreeBSD: editors/vim/add-bad.sh 302686 2012-08-17 16:08:14Z obrien $
+
+usage() {
+ echo 'usage: ${0##*/} <bad patch #s to add to ${BADPATCHES}>'
+ exit 1
+}
+if [ $# -lt 1 ]; then
+ usage
+fi
+
+sed -i '' "s/^BADPATCHES=.*$/& $*/" Makefile
Oops, something went wrong.

0 comments on commit dc90854

Please sign in to comment.