Attachment 190072 Details for Bug 225404 – www/emacs-w3m diff

[patch] www/emacs-w3m diff

emacs-w3m.diff (text/plain), 4.62 KB, created by Joseph Mingrone on 2018-01-25 23:04:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2018-01-25 23:04:17 UTC

Size: 4.62 KB

patch

obsolete

>diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
>index 159714c9d690..05c9ad9a799f 100644
>--- a/www/emacs-w3m/Makefile
>+++ b/www/emacs-w3m/Makefile
>@@ -1,129 +1,64 @@
> # Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
> # $FreeBSD$
> 
>-PORTNAME=	emacs-w3m
>+PORTNAME=	w3m
> PORTVERSION=	1.4.598.b.${SNAPDATE}
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www elisp
> MASTER_SITES=	LOCAL/nobutaka
>-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
>-DISTNAME=	${PORTNAME}-1.4.598-${SNAPDATE}
>+PKGNAMEPREFIX=	emacs-
>+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
>+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-1.4.598-${SNAPDATE}
> 
> MAINTAINER=	nobutaka@FreeBSD.org
>-COMMENT?=	Simple front-end to w3m for emacs
>+COMMENT=	Simple front-end to w3m for emacs
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		autoreconf tar:bzip2
>-USE_EMACS=	yes
>+BUILD_DEPENDS=	w3m:www/w3m
>+RUN_DEPENDS=	w3m:www/w3m
> 
>-SNAPDATE=	20170903
>+USES=		autoreconf emacs tar:bzip2
>+EMACS_FLAVORS=	full canna nox # devel_full and devel_nox fail during configure
> 
>+ALL_TARGET=	default
>+INSTALL_TARGET=	install install-icons
>+
>+NO_ARCH=	yes
>+SNAPDATE=	20170903
> MAKE_JOBS_UNSAFE=	yes
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS?=	--with-emacs=${EMACS_CMD} \
>-			--with-lispdir=${PREFIX}/${LISPDIR} \
>-			--with-icondir=${PREFIX}/${ICONDIR} \
>-			--without-compress-install
>-LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/w3m
>-ICONDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
>-ETCDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m
>+CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
>+		--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/w3m \
>+		--with-icondir=${PREFIX}/${EMACS_LIBDIR}/etc/w3m/icons \
>+		--without-compress-install
> 
> INFO=		emacs-w3m-ja emacs-w3m
>+PORTDOCS=	README*
> 
>-ALL_TARGET=	default
>-
>-PLIST_SUB+=	LISPDIR=${LISPDIR} \
>-		ICONDIR=${ICONDIR} \
>-		ETCDIR=${ETCDIR} \
>-		SHIMBUN=${SHIMBUN}
>-
>-DOCS=		README
>-DOCS_JA=	README.ja
>-
>-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
>-DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
>-
>-OPTIONS_DEFINE=	DOCS OCTET_VIEWER SHIMBUN
>+OPTIONS_DEFINE=		DOCS OCTET_VIEWER SHIMBUN
> OPTIONS_DEFAULT=	OCTET_VIEWER SHIMBUN
>+OPTIONS_SUB=		yes
> 
> OCTET_VIEWER_DESC=	Octet stream viewer support
>-SHIMBUN_DESC=	Build and/or install Shimbun
>-
>-.include <bsd.port.options.mk>
>-
>-.if !${PORT_OPTIONS:MSHIMBUN}
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
>-SHIMBUN=	"@comment "
>-.else
>-SHIMBUN=	""
>-.endif
>+SHIMBUN_DESC=		Build and/or install Shimbun
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} >= 23
>-FLIM_PORT=	editors/flim
>-SEMI_PORT=	editors/semi
>-INSTALL_TARGET=	install install-icons
>-PLIST_SUB+=	EMACS23=""
>-.else
>-PLIST_SUB+=	EMACS23="@comment "
>-.endif
>+SHIMBUN_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
>+SHIMBUN_BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
>+SHIMBUN_RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
> 
>-.if ${EMACS_PORT_NAME} == "emacs22"
>-INSTALL_TARGET=	install install-icons
>-.endif
>-
>-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
>-MULE_UCS_PORT=	converters/mule-ucs
>-INSTALL_TARGET=	install install-icons
>-.endif
>-
>-FLIM_TRUNK=	1.14
>-FLIM_COOKIE=	${LOCALBASE}/share/flim/flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
>-FLIM_PORT?=	editors/flim-${EMACS_PORT_NAME}
>-
>-SEMI_TRUNK=	1.14
>-SEMI_COOKIE=	${LOCALBASE}/share/semi/semi-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
>-SEMI_PORT?=	editors/semi-${EMACS_PORT_NAME}
>-
>-MULE_UCS_PORT?=	converters/mule-ucs-${EMACS_PORT_NAME}
>-MULE_UCS_ELISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
>-
>-BUILD_DEPENDS+=	w3m:www/w3m
>-RUN_DEPENDS+=	w3m:www/w3m
>-.if ${PORT_OPTIONS:MSHIMBUN}
>-BUILD_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
>-RUN_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
>-.endif
>-.if ${PORT_OPTIONS:MOCTET_VIEWER}
>-RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
>+OCTET_VIEWER_RUN_DEPENDS=\
>+		semi${EMACS_PKGNAMESUFFIX}>0:editors/semi@${EMACS_FLAVOR} \
> 		wvHtml:textproc/wv \
> 		xlhtml:textproc/xlhtml
>-PLIST_SUB+=	OCTET_VIEWER=""
>-.else
>-PLIST_SUB+=	OCTET_VIEWER="@comment "
>-.if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22
>-RUN_DEPENDS+=	${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
>-.endif
>-.endif
> 
> post-patch:
> 	@${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4
>-.if defined(EMACS_PACKAGESDIR)
>-	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
>-.endif
> 
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
>-.for i in ${DOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>-.endfor
>-.for i in ${DOCS_JA}
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR_JA}
>-.endfor
>-
>-.include <bsd.port.post.mk>
>+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>+
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 225404: 189999 | 190000 | 190053 | 190072 | 190073 | 190074