summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2014-05-19 07:49:10 +0000
committermiwi <miwi@FreeBSD.org>2014-05-19 07:49:10 +0000
commit817324e7e7fb63eb4832f87f757ed8ec182559ad (patch)
tree1182a6ef1e61d98a09f40105f4ab3620dcafaa1d
parent1fe12e7d106a18de182490894811cdb88ce443af (diff)
downloadFreeBSD-ports-817324e7e7fb63eb4832f87f757ed8ec182559ad.zip
FreeBSD-ports-817324e7e7fb63eb4832f87f757ed8ec182559ad.tar.gz
- Update to 9.8m
PR: 188358 Submitted by: ports fury
-rw-r--r--editors/vile/Makefile23
-rw-r--r--editors/vile/distinfo4
-rw-r--r--editors/vile/files/patch-filec.c11
-rw-r--r--editors/vile/pkg-plist31
-rw-r--r--editors/xvile/Makefile37
-rw-r--r--editors/xvile/distinfo4
-rw-r--r--editors/xvile/files/patch-filec.c11
-rw-r--r--editors/xvile/pkg-plist20
8 files changed, 42 insertions, 99 deletions
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index c88ed2b..be53b00 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -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>
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index d8bfbc9..21f27a9 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -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
diff --git a/editors/vile/files/patch-filec.c b/editors/vile/files/patch-filec.c
deleted file mode 100644
index a6faea3..0000000
--- a/editors/vile/files/patch-filec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- filec.c.orig 2008-02-14 11:54:22.713522435 +0100
-+++ filec.c 2008-02-14 11:55:24.224617839 +0100
-@@ -38,7 +38,7 @@
-
- #define isDotname(leaf) (!strcmp(leaf, ".") || !strcmp(leaf, ".."))
-
--#if defined(MISSING_EXTERN_ENVIRON) || (defined(__DJGPP__) && __DJGPP__ >= 2)
-+#if defined(MISSING_EXTERN_ENVIRON) || (defined(__DJGPP__) && __DJGPP__ >= 2) || defined(__BSD_VISIBLE)
- extern char **environ;
- #endif
-
diff --git a/editors/vile/pkg-plist b/editors/vile/pkg-plist
index 5503c23..496dca6 100644
--- a/editors/vile/pkg-plist
+++ b/editors/vile/pkg-plist
@@ -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
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index b65e21e..4cc41fb 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -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>
diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo
index d8bfbc9..21f27a9 100644
--- a/editors/xvile/distinfo
+++ b/editors/xvile/distinfo
@@ -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
diff --git a/editors/xvile/files/patch-filec.c b/editors/xvile/files/patch-filec.c
deleted file mode 100644
index a6faea3..0000000
--- a/editors/xvile/files/patch-filec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- filec.c.orig 2008-02-14 11:54:22.713522435 +0100
-+++ filec.c 2008-02-14 11:55:24.224617839 +0100
-@@ -38,7 +38,7 @@
-
- #define isDotname(leaf) (!strcmp(leaf, ".") || !strcmp(leaf, ".."))
-
--#if defined(MISSING_EXTERN_ENVIRON) || (defined(__DJGPP__) && __DJGPP__ >= 2)
-+#if defined(MISSING_EXTERN_ENVIRON) || (defined(__DJGPP__) && __DJGPP__ >= 2) || defined(__BSD_VISIBLE)
- extern char **environ;
- #endif
-
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index 2d6cfeb..c0f14c8 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -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%%
OpenPOWER on IntegriCloud