From c22fff5c69d7b512436d5c0ee9953dbf4a86248a Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 9 Oct 2015 22:07:50 +0000 Subject: editors/(x)vile: Upgrade version 9.8o => 9.8q PR: 203244 Submitted by: ports fury --- editors/vile/Makefile | 2 +- editors/vile/distinfo | 4 ++-- editors/xvile/Makefile | 19 +++++++++---------- editors/xvile/distinfo | 4 ++-- editors/xvile/files/patch-x11menu.c | 2 +- editors/xvile/files/patch-x11vile.h | 4 ++-- editors/xvile/pkg-plist | 2 ++ 7 files changed, 19 insertions(+), 18 deletions(-) (limited to 'editors') diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 39b8dfdf6d0c..d1f6d279f293 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vile -PORTVERSION= 9.8o +PORTVERSION= 9.8q CATEGORIES= editors MASTER_SITES= ftp://dickey.his.com/vile/current/ \ ftp://invisible-island.net/vile/current/ \ diff --git a/editors/vile/distinfo b/editors/vile/distinfo index 8a6c675c5450..ef74d6792da2 100644 --- a/editors/vile/distinfo +++ b/editors/vile/distinfo @@ -1,2 +1,2 @@ -SHA256 (vile-9.8o.tgz) = 45625c060cb9da3d68bba0d308fa61cb6a1cd7c7fd8b0e83aba8890632a19b24 -SIZE (vile-9.8o.tgz) = 2304783 +SHA256 (vile-9.8q.tgz) = 366b2b18ea25e55e7b9b6cc1d2b752f0a4fdc453a0a18aedd5773f456e782307 +SIZE (vile-9.8q.tgz) = 2321373 diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index a58fe69c9fb8..965ba82e905f 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vile -PORTVERSION= 9.8o +PORTVERSION= 9.8q CATEGORIES= editors MASTER_SITES= ftp://dickey.his.com/vile/current/ \ ftp://invisible-island.net/vile/current/ \ @@ -25,15 +25,18 @@ USE_XORG= x11 xext xpm GNU_CONFIGURE= yes CONFIGURE_ENV= cf_cv_crypt_works=yes CONFIGURE_ARGS= --disable-imake \ + --disable-desktop \ --enable-fontset \ + --with-icon-theme \ --with-xpm \ + --with-icondir=${PREFIX}/share/icons \ --with-pixmapdir=${PREFIX}/share/pixmaps MAKEFILE= makefile INSTALL_TARGET= install install-doc install-html CONFLICTS_INSTALL= vile-[0-9]* -OPTIONS_DEFINE= DOCS FILTERS FREETYPE ICONV PERL +OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_RADIO= MENUS OPTIONS_RADIO_MENUS= MOTIF XAW XAW3D OPTIONS_DEFAULT= ICONV @@ -46,7 +49,8 @@ ICONV_CONFIGURE_ON= --with-iconv ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --without-iconv --without-locale MENUS_DESC= Support for menus MOTIF_USES= motif -MOTIF_CONFIGURE_ON= --with-screen=motif +MOTIF_CONFIGURE_ON= --enable-colored-menus \ + --with-screen=motif PERL_USES= perl5 PERL_CONFIGURE_WITH= perl XAW_DESC= X Athena Widgets @@ -66,10 +70,6 @@ PLIST_SUB+= SO_EXT=".so" PLIST_SUB+= SO_EXT="" .endif -.if empty(PORT_OPTIONS:MICONV) -BROKEN= Does not build if ICONV support is disabled -.endif - .if empty(PORT_OPTIONS:MMOTIF) && empty(PORT_OPTIONS:MXAW) && empty(PORT_OPTIONS:MXAW3D) CONFIGURE_ARGS+= --with-screen=x11 .endif @@ -81,12 +81,11 @@ post-patch: s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \ ${WRKSRC}/makefile.in @${REINPLACE_CMD} -e \ - '/^Icon/s|=.*|=${PREFIX}/share/pixmaps/vile.xpm| ; \ - /^Categories/s|Application;||' \ + '/^Categories/s|Application;||' \ ${WRKSRC}/macros/*.desktop post-install: (cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \ - ${STAGEDIR}${DESKTOPDIR}) + ${STAGEDIR}${PREFIX}/share/applications) .include diff --git a/editors/xvile/distinfo b/editors/xvile/distinfo index 8a6c675c5450..ef74d6792da2 100644 --- a/editors/xvile/distinfo +++ b/editors/xvile/distinfo @@ -1,2 +1,2 @@ -SHA256 (vile-9.8o.tgz) = 45625c060cb9da3d68bba0d308fa61cb6a1cd7c7fd8b0e83aba8890632a19b24 -SIZE (vile-9.8o.tgz) = 2304783 +SHA256 (vile-9.8q.tgz) = 366b2b18ea25e55e7b9b6cc1d2b752f0a4fdc453a0a18aedd5773f456e782307 +SIZE (vile-9.8q.tgz) = 2321373 diff --git a/editors/xvile/files/patch-x11menu.c b/editors/xvile/files/patch-x11menu.c index 46523bb3b00c..9fb4adf1d89c 100644 --- a/editors/xvile/files/patch-x11menu.c +++ b/editors/xvile/files/patch-x11menu.c @@ -1,4 +1,4 @@ ---- x11menu.c.orig +--- x11menu.c.orig 2013-12-07 16:26:12 UTC +++ x11menu.c @@ -29,12 +29,21 @@ #endif diff --git a/editors/xvile/files/patch-x11vile.h b/editors/xvile/files/patch-x11vile.h index cc2f89e0f5c5..5209c5412cf5 100644 --- a/editors/xvile/files/patch-x11vile.h +++ b/editors/xvile/files/patch-x11vile.h @@ -1,5 +1,5 @@ ---- x11vile.h.orig 2013-04-15 04:09:08.000000000 +0900 -+++ x11vile.h 2014-02-01 21:50:00.000000000 +0900 +--- x11vile.h.orig 2013-04-14 19:09:08 UTC ++++ x11vile.h @@ -282,11 +282,19 @@ #if OPT_MENUS diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist index 36281887b328..20fc14d92921 100644 --- a/editors/xvile/pkg-plist +++ b/editors/xvile/pkg-plist @@ -116,6 +116,8 @@ share/applications/xvile.desktop %%PORTDOCS%%%%DOCSDIR%%/oleauto.doc %%PORTDOCS%%%%DOCSDIR%%/perl.doc %%PORTDOCS%%%%DOCSDIR%%/visvile.doc +share/icons/hicolor/48x48/apps/vile.png +share/icons/hicolor/scalable/apps/vile.svg share/pixmaps/vile.xpm %%DATADIR%%/ada.keywords %%DATADIR%%/ant.keywords -- cgit v1.2.3