Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2014 03:28:39 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/186420: editors/vile: Update to version 9.8l
Message-ID:  <20140204032839.eaa5f8dd569bfb2425ce1779@yahoo.com>
Resent-Message-ID: <201402031840.s13Ie2BM035027@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         186420
>Category:       ports
>Synopsis:       editors/vile: Update to version 9.8l
>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:   Mon Feb 03 18:40:02 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update editors/vile to version 9.8l
- Update editors/xvile to version 9.8l

[editors/xvile]
New file:
files/patch-x11menu.c
files/patch-x11vile.h

>How-To-Repeat:
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	editors_vile.diff
#	editors_xvile.diff
#
echo x - editors_vile.diff
sed 's/^X//' >editors_vile.diff << '53934d34ce97f0f7659ba27c70a458a1'
Xdiff -urN /usr/ports/editors/vile/Makefile editors/vile/Makefile
X--- /usr/ports/editors/vile/Makefile	2014-01-08 15:45:57.000000000 +0900
X+++ editors/vile/Makefile	2014-02-04 00:00:00.000000000 +0900
X@@ -2,7 +2,7 @@
X # $FreeBSD: head/editors/vile/Makefile 339036 2014-01-07 21:06:11Z antoine $
X 
X PORTNAME=	vile
X-PORTVERSION=	9.8k
X+PORTVERSION=	9.8l
X CATEGORIES=	editors
X MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
X 		ftp://invisible-island.net/vile/current/
X@@ -16,8 +16,7 @@
X 
X LICENSE=	GPLv2
X 
X-OPTIONS_DEFINE=	FILTERS ICONV PERL DOCS
X-FILTERS_DESC=	Loadable filters
X+BUILD_DEPENDS=	reflex:${PORTSDIR}/textproc/reflex
X 
X USES=		pkgconfig shebangfix
X SHEBANG_FILES=	perl/vileget
X@@ -26,44 +25,35 @@
X 
X CONFLICTS_INSTALL=	xvile-[0-9]*
X 
X+OPTIONS_DEFINE=		DOCS FILTERS ICONV PERL
X+OPTIONS_SUB=		yes
X+
X+FILTERS_DESC=		Loadable filters
X+FILTERS_CONFIGURE_WITH=	loadable-filters
X+ICONV_USES=		iconv
X+ICONV_CONFIGURE_ON=	--with-iconv ${ICONV_CONFIGURE_ARG}
X+ICONV_CONFIGURE_OFF=	--without-iconv --without-locale
X+PERL_USES=		perl5
X+PERL_CONFIGURE_WITH=	perl
X+
X .include <bsd.port.options.mk>
X 
X .if ${PORT_OPTIONS:MFILTERS}
X-CONFIGURE_ARGS+=	--with-loadable-filters
X PLIST_SUB+=	SO_EXT=".so"
X .else
X PLIST_SUB+=	SO_EXT=""
X .endif
X 
X-.if ${PORT_OPTIONS:MICONV}
X-USES+=		iconv
X-CONFIGURE_ARGS+=	--with-iconv ${ICONV_CONFIGURE_ARG}
X-PLIST_SUB+=	ICONV=""
X-.else
X-CONFIGURE_ARGS+=	--without-iconv --without-locale
X-PLIST_SUB+=	ICONV="@comment "
X-.endif
X-
X-.if ${PORT_OPTIONS:MPERL}
X-USES+=		perl5
X-CONFIGURE_ARGS+=	--with-perl
X-PLIST_SUB+=	PERL=""
X-.else
X-PLIST_SUB+=	PERL="@comment "
X-.endif
X-
X post-patch:
X 	@${REINPLACE_CMD} -e \
X 		's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in
X-	@${REINPLACE_CMD} -e \
X-		's|defined(FLEX_BETA)|0|' ${WRKSRC}/filters/filters.h
X 
X post-install:
X 	@${MKDIR} ${STAGEDIR}${DATADIR}/macros
X-	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${STAGEDIR}${DATADIR}/macros
X-.if ${PORT_OPTIONS:MDOCS}
X+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.rc \
X+		${STAGEDIR}${DATADIR}/macros)
X 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
X-	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${STAGEDIR}${DOCSDIR}
X-.endif
X+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.doc \
X+		${STAGEDIR}${DOCSDIR})
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/editors/vile/distinfo editors/vile/distinfo
X--- /usr/ports/editors/vile/distinfo	2013-11-06 22:06:01.000000000 +0900
X+++ editors/vile/distinfo	2014-02-04 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (vile-9.8k.tgz) = af8386a43fdf82ba3c8e4187b8fe850543c5baac769cf26bb2b437e5b3689e24
X-SIZE (vile-9.8k.tgz) = 2278349
X+SHA256 (vile-9.8l.tgz) = 2da06d7e949baa8541dc8ddd5e2d782346bbdaf59c9e564c1e8fedcc3a9bf59c
X+SIZE (vile-9.8l.tgz) = 2289659
53934d34ce97f0f7659ba27c70a458a1
echo x - editors_xvile.diff
sed 's/^X//' >editors_xvile.diff << '7ff9911af05e2cf75ccbb5bc57cf8863'
Xdiff -urN /usr/ports/editors/xvile/Makefile editors/xvile/Makefile
X--- /usr/ports/editors/xvile/Makefile	2014-01-08 15:45:57.000000000 +0900
X+++ editors/xvile/Makefile	2014-02-04 00:00:00.000000000 +0900
X@@ -2,7 +2,7 @@
X # $FreeBSD: head/editors/xvile/Makefile 339035 2014-01-07 20:55:37Z antoine $
X 
X PORTNAME=	xvile
X-PORTVERSION=	9.8k
X+PORTVERSION=	9.8l
X CATEGORIES=	editors
X MASTER_SITES=	ftp://dickey.his.com/vile/current/ \
X 		ftp://invisible-island.net/vile/current/
X@@ -17,14 +17,7 @@
X 
X LICENSE=	GPLv2
X 
X-OPTIONS_DEFINE=	FILTERS ICONV PERL DOCS
X-OPTIONS_RADIO=	MENUS
X-OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
X-OPTIONS_DEFAULT=	ICONV
X-FILTERS_DESC=	Loadable filters
X-MENUS_DESC=	Support for menus
X-XAW_DESC=	X Athena Widgets
X-XAW3D_DESC=	X Athena Widgets with 3D effect
X+BUILD_DEPENDS=	reflex:${PORTSDIR}/textproc/reflex
X 
X USES=		pkgconfig shebangfix
X SHEBANG_FILES=	macros/lxvile macros/lxvile-fonts perl/vileget
X@@ -40,68 +33,67 @@
X 
X CONFLICTS_INSTALL=	vile-[0-9]*
X 
X+OPTIONS_DEFINE=		DOCS FILTERS ICONV PERL
X+OPTIONS_RADIO=		MENUS
X+OPTIONS_RADIO_MENUS=	MOTIF XAW XAW3D
X+OPTIONS_DEFAULT=	ICONV
X+OPTIONS_SUB=		yes
X+
X+FILTERS_DESC=		Loadable filters
X+FILTERS_CONFIGURE_WITH=	loadable-filters
X+ICONV_USES=		iconv
X+ICONV_CONFIGURE_ON=	--with-iconv ${ICONV_CONFIGURE_ARG}
X+ICONV_CONFIGURE_OFF=	--without-iconv --without-locale
X+MENUS_DESC=		Support for menus
X+MOTIF_USE=		MOTIF=yes
X+MOTIF_CONFIGURE_ON=	--with-screen=motif
X+PERL_USES=		perl5
X+PERL_CONFIGURE_WITH=	perl
X+XAW_DESC=		X Athena Widgets
X+XAW_USE=		XORG=xaw
X+XAW_CONFIGURE_ON=	--with-screen=athena
X+XAW3D_DESC=		X Athena Widgets with 3D effect
X+XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
X+XAW3D_CONFIGURE_ON=	--enable-colored-menus \
X+			--with-Xaw3d \
X+			--with-screen=xaw3d
X+
X .include <bsd.port.options.mk>
X 
X .if ${PORT_OPTIONS:MFILTERS}
X-CONFIGURE_ARGS+=	--with-loadable-filters
X PLIST_SUB+=	SO_EXT=".so"
X .else
X PLIST_SUB+=	SO_EXT=""
X .endif
X 
X-.if ${PORT_OPTIONS:MICONV}
X-USES+=		iconv
X-CONFIGURE_ARGS+=	--with-iconv ${ICONV_CONFIGURE_ARG}
X-PLIST_SUB+=	ICONV=""
X-.else
X+.if empty(PORT_OPTIONS:MICONV)
X BROKEN=		Does not build if ICONV support is disabled
X-CONFIGURE_ARGS+=	--without-iconv --without-locale
X-PLIST_SUB+=	ICONV="@comment "
X-.endif
X-
X-.if ${PORT_OPTIONS:MPERL}
X-USES+=		perl5
X-CONFIGURE_ARGS+=	--with-perl
X-PLIST_SUB+=	PERL=""
X-.else
X-PLIST_SUB+=	PERL="@comment "
X .endif
X 
X .if empty(PORT_OPTIONS:MMOTIF) && empty(PORT_OPTIONS:MXAW) && empty(PORT_OPTIONS:MXAW3D)
X CONFIGURE_ARGS+=	--with-screen=x11
X .endif
X 
X-.if ${PORT_OPTIONS:MMOTIF}
X-USES+=		motif
X-CONFIGURE_ARGS+=	--with-screen=motif
X-.endif
X-
X-.if ${PORT_OPTIONS:MXAW}
X-USE_XORG+=	xaw
X-CONFIGURE_ARGS+=	--with-screen=athena
X-.endif
X-
X-.if ${PORT_OPTIONS:MXAW3D}
X-LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
X-CONFIGURE_ARGS+=	--enable-colored-menus \
X-			--with-Xaw3d \
X-			--with-screen=xaw3d
X-.endif
X-
X post-patch:
X 	@${REINPLACE_CMD} -e \
X 		's|^DOCDIR|#DOCDIR|' ${WRKSRC}/makefile.in
X 	@${REINPLACE_CMD} -e \
X-		's|defined(FLEX_BETA)|0|' ${WRKSRC}/filters/filters.h
X+		'/^Icons/s|=.*|=${PREFIX}/share/pixmaps/vile_48x48.png|' \
X+		${WRKSRC}/macros/*.desktop
X 
X post-install:
X+	(cd ${WRKSRC}/icons && ${INSTALL_DATA} vile_48x48.png \
X+		${STAGEDIR}${PREFIX}/share/pixmaps)
X+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \
X+		${STAGEDIR}${DESKTOPDIR})
X 	@${MKDIR} ${STAGEDIR}${DATADIR}/macros
X-	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${STAGEDIR}${DATADIR}/macros
X-	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
X-	${INSTALL_DATA} ${WRKSRC}/macros/*.desktop ${STAGEDIR}${DESKTOPDIR}
X-.if ${PORT_OPTIONS:MDOCS}
X+	(cd ${WRKSRC}/macros && ${INSTALL_DATA} *.rc \
X+		${STAGEDIR}${DATADIR}/macros)
X 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
X-	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${STAGEDIR}${DOCSDIR}
X-.endif
X+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.doc \
X+		${STAGEDIR}${DOCSDIR})
X+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
X+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \
X+		${STAGEDIR}${DOCSDIR}/html)
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/editors/xvile/distinfo editors/xvile/distinfo
X--- /usr/ports/editors/xvile/distinfo	2013-11-06 22:06:07.000000000 +0900
X+++ editors/xvile/distinfo	2014-02-04 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (vile-9.8k.tgz) = af8386a43fdf82ba3c8e4187b8fe850543c5baac769cf26bb2b437e5b3689e24
X-SIZE (vile-9.8k.tgz) = 2278349
X+SHA256 (vile-9.8l.tgz) = 2da06d7e949baa8541dc8ddd5e2d782346bbdaf59c9e564c1e8fedcc3a9bf59c
X+SIZE (vile-9.8l.tgz) = 2289659
Xdiff -urN /usr/ports/editors/xvile/files/patch-x11menu.c editors/xvile/files/patch-x11menu.c
X--- /usr/ports/editors/xvile/files/patch-x11menu.c	1970-01-01 09:00:00.000000000 +0900
X+++ editors/xvile/files/patch-x11menu.c	2014-02-04 00:00:00.000000000 +0900
X@@ -0,0 +1,24 @@
X+--- x11menu.c.orig
X++++ x11menu.c
X+@@ -29,12 +29,21 @@
X+ #endif
X+ 
X+ #if ATHENA_WIDGETS
X++#ifdef HAVE_LIB_XAW3D
X++#include <X11/Xaw3d/Form.h>
X++#include <X11/Xaw3d/SimpleMenu.h>
X++#include <X11/Xaw3d/MenuButton.h>
X++#include <X11/Xaw3d/SmeLine.h>
X++#include <X11/Xaw3d/SmeBSB.h>
X++#endif
X++#ifdef HAVE_LIB_XAW
X+ #include <X11/Xaw/Form.h>
X+ #include <X11/Xaw/SimpleMenu.h>
X+ #include <X11/Xaw/MenuButton.h>
X+ #include <X11/Xaw/SmeLine.h>
X+ #include <X11/Xaw/SmeBSB.h>
X+ #endif
X++#endif
X+ 
X+ #define Nval(name,value) name, (XtArgVal)(value)
X+ #define Sval(name,value) name, (value)
Xdiff -urN /usr/ports/editors/xvile/files/patch-x11vile.h editors/xvile/files/patch-x11vile.h
X--- /usr/ports/editors/xvile/files/patch-x11vile.h	1970-01-01 09:00:00.000000000 +0900
X+++ editors/xvile/files/patch-x11vile.h	2014-02-04 00:00:00.000000000 +0900
X@@ -0,0 +1,22 @@
X+--- x11vile.h.orig	2013-04-15 04:09:08.000000000 +0900
X++++ x11vile.h	2014-02-01 21:50:00.000000000 +0900
X+@@ -282,11 +282,19 @@
X+ 
X+ #if OPT_MENUS
X+ #if ATHENA_WIDGETS
X++#ifdef HAVE_LIB_XAW3D
X++#include <X11/Xaw3d/SimpleMenu.h>
X++#include <X11/Xaw3d/Box.h>
X++#include <X11/Xaw3d/Form.h>
X++#include <X11/Xaw3d/Paned.h>
X++#endif
X++#ifdef HAVE_LIB_XAW
X+ #include <X11/Xaw/SimpleMenu.h>
X+ #include <X11/Xaw/Box.h>
X+ #include <X11/Xaw/Form.h>
X+ #include <X11/Xaw/Paned.h>
X+ #endif
X++#endif
X+ #if MOTIF_WIDGETS
X+ #include <Xm/RowColumn.h>
X+ #endif
Xdiff -urN /usr/ports/editors/xvile/pkg-plist editors/xvile/pkg-plist
X--- /usr/ports/editors/xvile/pkg-plist	2014-01-08 15:45:57.000000000 +0900
X+++ editors/xvile/pkg-plist	2014-02-04 00:00:00.000000000 +0900
X@@ -96,6 +96,19 @@
X %%PORTDOCS%%%%DOCSDIR%%/config.doc
X %%PORTDOCS%%%%DOCSDIR%%/dir.doc
X %%PORTDOCS%%%%DOCSDIR%%/filters.doc
X+%%PORTDOCS%%%%DOCSDIR%%/html/Vileserv.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/config.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/dir.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/filters.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/macros.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/menus.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/modes.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/oleauto.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/perl.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/vile-hlp.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/vile-man.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/vile-toc.html
X+%%PORTDOCS%%%%DOCSDIR%%/html/visvile.html
X %%PORTDOCS%%%%DOCSDIR%%/macros.doc
X %%PORTDOCS%%%%DOCSDIR%%/menus.doc
X %%PORTDOCS%%%%DOCSDIR%%/modes.doc
X@@ -256,9 +269,11 @@
X %%DATADIR%%/xsl.keywords
X %%DATADIR%%/yacc.keywords
X %%DATADIR%%/zsh.keywords
X+share/pixmaps/vile_48x48.png
X %%PERL%%@dirrm %%DATADIR%%/perl/Vile
X %%PERL%%@dirrm %%DATADIR%%/perl
X @dirrm %%DATADIR%%/macros
X @dirrm %%DATADIR%%
X+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
X %%PORTDOCS%%@dirrm %%DOCSDIR%%
X @dirrm lib/vile
7ff9911af05e2cf75ccbb5bc57cf8863
exit

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140204032839.eaa5f8dd569bfb2425ce1779>