- Update editors/vile to version 9.8m - Update editors/xvile to version 9.8m [editors/vile] Remove file: files/patch-filec.c [editors/xvile] Remove file: files/patch-filec.c
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Mon May 19 07:49:10 2014 New Revision: 354506 URL: http://svnweb.freebsd.org/changeset/ports/354506 QAT: https://qat.redports.org/buildarchive/r354506/ Log: - Update to 9.8m PR: 188358 Submitted by: ports fury Deleted: head/editors/vile/files/ head/editors/xvile/files/patch-filec.c Modified: head/editors/vile/Makefile head/editors/vile/distinfo head/editors/vile/pkg-plist head/editors/xvile/Makefile head/editors/xvile/distinfo head/editors/xvile/pkg-plist Modified: head/editors/vile/Makefile ============================================================================== --- head/editors/vile/Makefile Mon May 19 07:47:38 2014 (r354505) +++ head/editors/vile/Makefile Mon May 19 07:49:10 2014 (r354506) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= vile -PORTVERSION= 9.8l +PORTVERSION= 9.8m CATEGORIES= editors MASTER_SITES= ftp://dickey.his.com/vile/current/ \ - ftp://invisible-island.net/vile/current/ -EXTRACT_SUFX= .tgz + ftp://invisible-island.net/vile/current/ \ + http://invisible-mirror.net/archives/vile/current/ PATCH_SITES= ${MASTER_SITES:S,vile/current/,vile/patches/,g} PATCHFILES= # none @@ -18,10 +18,12 @@ LICENSE= GPLv2 BUILD_DEPENDS= reflex:${PORTSDIR}/textproc/reflex -USES= pkgconfig shebangfix +USES= pkgconfig shebangfix tar:tgz SHEBANG_FILES= perl/vileget GNU_CONFIGURE= yes +CONFIGURE_ENV= cf_cv_crypt_works=yes MAKEFILE= makefile +INSTALL_TARGET= install install-doc install-html CONFLICTS_INSTALL= xvile-[0-9]* @@ -46,14 +48,9 @@ PLIST_SUB+= SO_EXT="" post-patch: @${REINPLACE_CMD} -e \ - 's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in - -post-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/macros - (cd ${WRKSRC}/macros && ${INSTALL_DATA} *.rc \ - ${STAGEDIR}${DATADIR}/macros) - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} *.doc \ - ${STAGEDIR}${DOCSDIR}) + 's|$$(datadir)/doc|@datadir@/doc/vile| ; \ + s|$$(datadir)/html|$$(docdir)/html| ; \ + s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \ + ${WRKSRC}/makefile.in .include <bsd.port.mk> Modified: head/editors/vile/distinfo ============================================================================== --- head/editors/vile/distinfo Mon May 19 07:47:38 2014 (r354505) +++ head/editors/vile/distinfo Mon May 19 07:49:10 2014 (r354506) @@ -1,2 +1,2 @@ -SHA256 (vile-9.8l.tgz) = 2da06d7e949baa8541dc8ddd5e2d782346bbdaf59c9e564c1e8fedcc3a9bf59c -SIZE (vile-9.8l.tgz) = 2289659 +SHA256 (vile-9.8m.tgz) = f82effe1ed4ded9423b804de2db0c1f7e1ea99d1f6f5f331762f702f3815056b +SIZE (vile-9.8m.tgz) = 2292474 Modified: head/editors/vile/pkg-plist ============================================================================== --- head/editors/vile/pkg-plist Mon May 19 07:47:38 2014 (r354505) +++ head/editors/vile/pkg-plist Mon May 19 07:49:10 2014 (r354506) @@ -87,6 +87,18 @@ man/man1/vile.1.gz %%PORTDOCS%%%%DOCSDIR%%/config.doc %%PORTDOCS%%%%DOCSDIR%%/dir.doc %%PORTDOCS%%%%DOCSDIR%%/filters.doc +%%PORTDOCS%%%%DOCSDIR%%/html/Vileserv.html +%%PORTDOCS%%%%DOCSDIR%%/html/config.html +%%PORTDOCS%%%%DOCSDIR%%/html/dir.html +%%PORTDOCS%%%%DOCSDIR%%/html/filters.html +%%PORTDOCS%%%%DOCSDIR%%/html/macros.html +%%PORTDOCS%%%%DOCSDIR%%/html/menus.html +%%PORTDOCS%%%%DOCSDIR%%/html/modes.html +%%PORTDOCS%%%%DOCSDIR%%/html/oleauto.html +%%PORTDOCS%%%%DOCSDIR%%/html/perl.html +%%PORTDOCS%%%%DOCSDIR%%/html/vile-hlp.html +%%PORTDOCS%%%%DOCSDIR%%/html/vile-toc.html +%%PORTDOCS%%%%DOCSDIR%%/html/visvile.html %%PORTDOCS%%%%DOCSDIR%%/macros.doc %%PORTDOCS%%%%DOCSDIR%%/menus.doc %%PORTDOCS%%%%DOCSDIR%%/modes.doc @@ -141,23 +153,6 @@ man/man1/vile.1.gz %%DATADIR%%/loaderrs.rc %%DATADIR%%/lua.keywords %%DATADIR%%/m4.keywords -%%DATADIR%%/macros/color-ls.rc -%%DATADIR%%/macros/complete.rc -%%DATADIR%%/macros/dates.rc -%%DATADIR%%/macros/digraphs.rc -%%DATADIR%%/macros/gnugpg.rc -%%DATADIR%%/macros/loaderrs.rc -%%DATADIR%%/macros/manpage.rc -%%DATADIR%%/macros/modes.rc -%%DATADIR%%/macros/palettes.rc -%%DATADIR%%/macros/pictmode.rc -%%DATADIR%%/macros/search.rc -%%DATADIR%%/macros/shifts.rc -%%DATADIR%%/macros/showeach.rc -%%DATADIR%%/macros/vileinit.rc -%%DATADIR%%/macros/vilemenu.rc -%%DATADIR%%/macros/vileperl.rc -%%DATADIR%%/macros/which.rc %%DATADIR%%/mail.keywords %%DATADIR%%/mailcap.keywords %%DATADIR%%/make.keywords @@ -247,7 +242,7 @@ man/man1/vile.1.gz %%DATADIR%%/zsh.keywords %%PERL%%@dirrm %%DATADIR%%/perl/Vile %%PERL%%@dirrm %%DATADIR%%/perl -@dirrm %%DATADIR%%/macros @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/vile Modified: head/editors/xvile/Makefile ============================================================================== --- head/editors/xvile/Makefile Mon May 19 07:47:38 2014 (r354505) +++ head/editors/xvile/Makefile Mon May 19 07:49:10 2014 (r354506) @@ -1,13 +1,13 @@ # Created by: pgf # $FreeBSD$ -PORTNAME= xvile -PORTVERSION= 9.8l +PORTNAME= vile +PORTVERSION= 9.8m CATEGORIES= editors MASTER_SITES= ftp://dickey.his.com/vile/current/ \ - ftp://invisible-island.net/vile/current/ -DISTNAME= vile-${PORTVERSION} -EXTRACT_SUFX= .tgz + ftp://invisible-island.net/vile/current/ \ + http://invisible-mirror.net/archives/vile/current/ +PKGNAMEPREFIX= x PATCH_SITES= ${MASTER_SITES:S,vile/current/,vile/patches/,g} PATCHFILES= # none @@ -19,24 +19,24 @@ LICENSE= GPLv2 BUILD_DEPENDS= reflex:${PORTSDIR}/textproc/reflex -USES= pkgconfig shebangfix +USES= pkgconfig shebangfix tar:tgz SHEBANG_FILES= macros/lxvile macros/lxvile-fonts perl/vileget USE_XORG= x11 xext xpm GNU_CONFIGURE= yes +CONFIGURE_ENV= cf_cv_crypt_works=yes CONFIGURE_ARGS= --disable-imake \ --enable-fontset \ --with-xpm \ --with-pixmapdir=${PREFIX}/share/pixmaps MAKEFILE= makefile - -DATADIR= ${PREFIX}/share/vile +INSTALL_TARGET= install install-doc install-html CONFLICTS_INSTALL= vile-[0-9]* OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_RADIO= MENUS OPTIONS_RADIO_MENUS= MOTIF XAW XAW3D -OPTIONS_DEFAULT= ICONV +OPTIONS_DEFAULT= FREETYPE ICONV OPTIONS_SUB= yes FILTERS_DESC= Loadable filters @@ -76,24 +76,17 @@ CONFIGURE_ARGS+= --with-screen=x11 post-patch: @${REINPLACE_CMD} -e \ - 's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in + 's|$$(datadir)/doc|@datadir@/doc/vile| ; \ + s|$$(datadir)/html|$$(docdir)/html| ; \ + s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \ + ${WRKSRC}/makefile.in @${REINPLACE_CMD} -e \ - '/^Icons/s|=.*|=${PREFIX}/share/pixmaps/vile_48x48.png|' \ + '/^Icon/s|=.*|=${PREFIX}/share/pixmaps/vile.xpm| ; \ + /^Categories/s|Applicasion;||' \ ${WRKSRC}/macros/*.desktop post-install: - (cd ${WRKSRC}/icons && ${INSTALL_DATA} vile_48x48.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps) (cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \ ${STAGEDIR}${DESKTOPDIR}) - @${MKDIR} ${STAGEDIR}${DATADIR}/macros - (cd ${WRKSRC}/macros && ${INSTALL_DATA} *.rc \ - ${STAGEDIR}${DATADIR}/macros) - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} *.doc \ - ${STAGEDIR}${DOCSDIR}) - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html - (cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \ - ${STAGEDIR}${DOCSDIR}/html) .include <bsd.port.mk> Modified: head/editors/xvile/distinfo ============================================================================== --- head/editors/xvile/distinfo Mon May 19 07:47:38 2014 (r354505) +++ head/editors/xvile/distinfo Mon May 19 07:49:10 2014 (r354506) @@ -1,2 +1,2 @@ -SHA256 (vile-9.8l.tgz) = 2da06d7e949baa8541dc8ddd5e2d782346bbdaf59c9e564c1e8fedcc3a9bf59c -SIZE (vile-9.8l.tgz) = 2289659 +SHA256 (vile-9.8m.tgz) = f82effe1ed4ded9423b804de2db0c1f7e1ea99d1f6f5f331762f702f3815056b +SIZE (vile-9.8m.tgz) = 2292474 Modified: head/editors/xvile/pkg-plist ============================================================================== --- head/editors/xvile/pkg-plist Mon May 19 07:47:38 2014 (r354505) +++ head/editors/xvile/pkg-plist Mon May 19 07:49:10 2014 (r354506) @@ -106,7 +106,6 @@ share/applications/xvile.desktop %%PORTDOCS%%%%DOCSDIR%%/html/oleauto.html %%PORTDOCS%%%%DOCSDIR%%/html/perl.html %%PORTDOCS%%%%DOCSDIR%%/html/vile-hlp.html -%%PORTDOCS%%%%DOCSDIR%%/html/vile-man.html %%PORTDOCS%%%%DOCSDIR%%/html/vile-toc.html %%PORTDOCS%%%%DOCSDIR%%/html/visvile.html %%PORTDOCS%%%%DOCSDIR%%/macros.doc @@ -164,23 +163,6 @@ share/pixmaps/vile.xpm %%DATADIR%%/loaderrs.rc %%DATADIR%%/lua.keywords %%DATADIR%%/m4.keywords -%%DATADIR%%/macros/color-ls.rc -%%DATADIR%%/macros/complete.rc -%%DATADIR%%/macros/dates.rc -%%DATADIR%%/macros/digraphs.rc -%%DATADIR%%/macros/gnugpg.rc -%%DATADIR%%/macros/loaderrs.rc -%%DATADIR%%/macros/manpage.rc -%%DATADIR%%/macros/modes.rc -%%DATADIR%%/macros/palettes.rc -%%DATADIR%%/macros/pictmode.rc -%%DATADIR%%/macros/search.rc -%%DATADIR%%/macros/shifts.rc -%%DATADIR%%/macros/showeach.rc -%%DATADIR%%/macros/vileinit.rc -%%DATADIR%%/macros/vilemenu.rc -%%DATADIR%%/macros/vileperl.rc -%%DATADIR%%/macros/which.rc %%DATADIR%%/mail.keywords %%DATADIR%%/mailcap.keywords %%DATADIR%%/make.keywords @@ -269,10 +251,8 @@ share/pixmaps/vile.xpm %%DATADIR%%/xsl.keywords %%DATADIR%%/yacc.keywords %%DATADIR%%/zsh.keywords -share/pixmaps/vile_48x48.png %%PERL%%@dirrm %%DATADIR%%/perl/Vile %%PERL%%@dirrm %%DATADIR%%/perl -@dirrm %%DATADIR%%/macros @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"