Attachment 148005 Details for Bug 194165 – editors_nano-devel.diff

[patch] editors_nano-devel.diff

editors_nano-devel.diff (text/plain), 3.95 KB, created by tkato432 on 2014-10-05 18:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-10-05 18:31:34 UTC

Size: 3.95 KB

patch

obsolete

>diff -urN /usr/ports/editors/nano-devel/Makefile editors/nano-devel/Makefile
>--- /usr/ports/editors/nano-devel/Makefile	2014-09-24 16:01:54.000000000 +0900
>+++ editors/nano-devel/Makefile	2014-10-06 00:00:00.000000000 +0900
>@@ -1,11 +1,10 @@
> # $FreeBSD: head/editors/nano-devel/Makefile 369161 2014-09-24 06:00:09Z eadler $
> 
> PORTNAME=	nano
>-PORTVERSION=	2.3.3
>+PORTVERSION=	2.3.6
> CATEGORIES=	editors
> MASTER_SITES=	http://www.nano-editor.org/dist/v${PORTVERSION:R}/ \
>-		${MASTER_SITE_GNU}
>-
>+		GNU
> PKGNAMESUFFIX=	-devel
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -13,50 +12,38 @@
> 
> LICENSE=	GPLv3
> 
>-CONFLICTS=	nano-2*
>-
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
>+		--enable-utf8
> 
>-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=	DOCS NLS
>-
>-.include <bsd.port.options.mk>
>+CONFLICTS=	nano-2*
> 
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-PLIST_SUB+=	NLS=""
>-.else
>-CONFIGURE_ARGS+=--disable-nls
>-PLIST_SUB+=	NLS="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-MAKE_ARGS+=	install_htmlmanDATA=install-htmlmanDATA
>-.else
>-MAKE_ARGS+=	install_htmlmanDATA=""
>-.endif
>+PORTSCOUT=	limitw:1,odd
> 
> INFO=		nano
> 
>-PORTSCOUT=	limitw:1,odd
>-
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=		DOCS NLS
>+OPTIONS_SUB=		yes
> 
>-CONFIGURE_ARGS+=--enable-utf8
>+NLS_USES=		gettext
>+NLS_CONFIGURE_ENABLE=	nls
> 
> post-build:
>-	cd ${WRKSRC}/doc/man; ${REINPLACE_CMD} \
>-		-e 's:SYSCONFDIR:${PREFIX}/etc:g' \
>-		-e 's:EXAMPLESDIR:${EXAMPLESDIR}:g' \
>-		nano.1 rnano.1 nanorc.5 ${WRKSRC}/doc/texinfo/${INFO:=.info}
>-	${REINPLACE_CMD} -e 's/\\</[[:<:]]/g' -e 's/\\>/[[:>:]]/g' \
>-		${WRKSRC}/doc/syntax/*.nanorc
>+.for i in man/nano.1 man/rnano.1 man/nanorc.5 texinfo/nano.info
>+	@${REINPLACE_CMD} -e \
>+		's|%%SYSCONFDIR%%|${PREFIX}/etc|g ; \
>+		 s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' ${WRKSRC}/doc/${i}
>+.endfor
>+	@${REINPLACE_CMD} -e \
>+		's/\\</[[:<:]]/g ; \
>+		 s/\\>/[[:>:]]/g' ${WRKSRC}/doc/syntax/*.nanorc
> 
> post-install:
>-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/doc/nanorc.sample ${STAGEDIR}${EXAMPLESDIR}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} nanorc.sample \
>+		${STAGEDIR}${EXAMPLESDIR})
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/editors/nano-devel/distinfo editors/nano-devel/distinfo
>--- /usr/ports/editors/nano-devel/distinfo	2014-06-21 17:47:53.000000000 +0900
>+++ editors/nano-devel/distinfo	2014-10-06 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (nano-2.3.3.tar.gz) = d80e0fce656b5cd2f327ea599c708c897dc1b8c608e87c756d63c79e97e8cc19
>-SIZE (nano-2.3.3.tar.gz) = 1812671
>+SHA256 (nano-2.3.6.tar.gz) = a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534
>+SIZE (nano-2.3.6.tar.gz) = 1816012
>diff -urN /usr/ports/editors/nano-devel/files/patch-doc_man_nanorc.5 editors/nano-devel/files/patch-doc_man_nanorc.5
>--- /usr/ports/editors/nano-devel/files/patch-doc_man_nanorc.5	2014-06-21 17:47:53.000000000 +0900
>+++ editors/nano-devel/files/patch-doc_man_nanorc.5	2014-10-06 00:00:00.000000000 +0900
>@@ -9,7 +9,7 @@
>  .PP
> -\fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your
> -system)
>-+\fIEXAMPLESDIR/nanorc.sample\fP
>++\fI%%EXAMPLESDIR%%/nanorc.sample\fP
>  .SH AUTHOR
>  Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
>  \fITHANKS\fP for details).  This manual page was originally written by
>diff -urN /usr/ports/editors/nano-devel/pkg-plist editors/nano-devel/pkg-plist
>--- /usr/ports/editors/nano-devel/pkg-plist	2014-06-21 17:47:53.000000000 +0900
>+++ editors/nano-devel/pkg-plist	2014-10-06 00:00:00.000000000 +0900
>@@ -80,13 +80,6 @@
> %%DATADIR%%/tex.nanorc
> %%DATADIR%%/texinfo.nanorc
> %%DATADIR%%/xml.nanorc
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
> %%NLS%%%%DOCSDIR%%/fr/nano.1.html
> %%NLS%%%%DOCSDIR%%/fr/nanorc.5.html
> %%NLS%%%%DOCSDIR%%/fr/rnano.1.html
>-%%NLS%%@dirrm %%DOCSDIR%%/fr
>-@dirrmtry man/fr/man1
>-@dirrmtry man/fr/man5
>-@dirrmtry man/fr
>-@dirrmtry %%DATADIR%%

Actions: View | Diff

Attachments on bug 194165: 148005