diff options
-rw-r--r-- | www/emacs-w3m-snapshot/Makefile | 15 | ||||
-rw-r--r-- | www/emacs-w3m-snapshot/PLIST | 4 | ||||
-rw-r--r-- | www/emacs-w3m-snapshot/distinfo | 12 | ||||
-rw-r--r-- | www/emacs-w3m-snapshot/options.mk | 3 | ||||
-rw-r--r-- | www/emacs-w3m-snapshot/patches/patch-Makefile.in | 16 | ||||
-rw-r--r-- | www/emacs-w3m-snapshot/patches/patch-w3m.el | 10 | ||||
-rw-r--r-- | www/emacs-w3m-snapshot/patches/patch-w3mhack.el | 16 |
7 files changed, 55 insertions, 21 deletions
diff --git a/www/emacs-w3m-snapshot/Makefile b/www/emacs-w3m-snapshot/Makefile index e7cd8f15f1e..483f3b3eacc 100644 --- a/www/emacs-w3m-snapshot/Makefile +++ b/www/emacs-w3m-snapshot/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2013/02/17 19:18:10 dholland Exp $ +# $NetBSD: Makefile,v 1.10 2013/03/04 19:12:22 hiramatsu Exp $ -DISTNAME= w3m-el-snapshot_1.4.442+0.20110729.orig -PKGREVISION= 2 +DISTNAME= w3m-el-snapshot_1.4.483+0.20120614.orig PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/w3m-el-snapshot_/emacs-w3m-/:S/+0//:S/.orig//} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/} @@ -9,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/} MAINTAINER= makoto@ki.nu HOMEPAGE= http://emacs-w3m.namazu.org/ COMMENT= Emacs frontend for w3m browser +LICENSE= gnu-gpl-v2 USE_TOOLS+= makeinfo gzip autoconf INFO_FILES= yes @@ -18,9 +18,9 @@ DEPENDS+= w3m{,-img}>=0.5.2nb3:../../www/w3m GNU_CONFIGURE= yes CONFIGURE_ARGS+= --srcdir=${WRKSRC} CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ENV+= GAMEOWN=${GAMEOWN} +CONFIGURE_ENV+= GAMEOWN=${GAMES_USER} BUILD_TARGET= -WRKSRC= ${WRKDIR}/emacs-w3m +WRKSRC= ${WRKDIR}/w3m-el-snapshot-1.4.483+0.20120614.orig EVAL_PREFIX+= W3M_PREFIX=w3m @@ -30,14 +30,9 @@ SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= w3m.el SUBST_SED.paths= -e 's|@W3M@|${W3M_PREFIX}/bin/w3m|g' -INSTALL_MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} \ - infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} - BUILD_DEFS+= VARBASE BUILD_DEFS+= GAMEDATAMODE -PLIST_SRC+= PLIST - .include "options.mk" .include "../../devel/apel/buildlink3.mk" diff --git a/www/emacs-w3m-snapshot/PLIST b/www/emacs-w3m-snapshot/PLIST index 609d7afb51e..ad3cc2a5e37 100644 --- a/www/emacs-w3m-snapshot/PLIST +++ b/www/emacs-w3m-snapshot/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2011/12/02 23:05:42 minskim Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/03/04 19:12:22 hiramatsu Exp $ info/emacs-w3m-ja.info info/emacs-w3m.info ${EMACS_LISPPREFIX}/w3m/ChangeLog @@ -40,6 +40,8 @@ ${EMACS_LISPPREFIX}/w3m/sb-bbc.el ${EMACS_LISPPREFIX}/w3m/sb-bbc.elc ${EMACS_LISPPREFIX}/w3m/sb-bbdb-ml.el ${EMACS_LISPPREFIX}/w3m/sb-bbdb-ml.elc +${EMACS_LISPPREFIX}/w3m/sb-chise.el +${EMACS_LISPPREFIX}/w3m/sb-chise.elc ${EMACS_LISPPREFIX}/w3m/sb-cgi-board.el ${EMACS_LISPPREFIX}/w3m/sb-cgi-board.elc ${EMACS_LISPPREFIX}/w3m/sb-cnet-jp.el diff --git a/www/emacs-w3m-snapshot/distinfo b/www/emacs-w3m-snapshot/distinfo index df90b1e6fc0..f807593b731 100644 --- a/www/emacs-w3m-snapshot/distinfo +++ b/www/emacs-w3m-snapshot/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.5 2011/12/01 17:53:58 minskim Exp $ +$NetBSD: distinfo,v 1.6 2013/03/04 19:12:22 hiramatsu Exp $ -SHA1 (w3m-el-snapshot_1.4.442+0.20110729.orig.tar.gz) = 6ef7b01891142ec8c0c8c6f9522d67540fab244d -RMD160 (w3m-el-snapshot_1.4.442+0.20110729.orig.tar.gz) = b8c21021aa1c3f46554934a82223455b3cdd7cc5 -Size (w3m-el-snapshot_1.4.442+0.20110729.orig.tar.gz) = 983801 bytes -SHA1 (patch-w3m.el) = 536f58f3ef4c4fda546715d2bf07191d4a3eee5f +SHA1 (w3m-el-snapshot_1.4.483+0.20120614.orig.tar.gz) = a7a9ce6b664c9b3e4c4b23f8f3ebd8b558c94dac +RMD160 (w3m-el-snapshot_1.4.483+0.20120614.orig.tar.gz) = 591afd134c6e22af9a3e7b93475f62a0dac61f4e +Size (w3m-el-snapshot_1.4.483+0.20120614.orig.tar.gz) = 995591 bytes +SHA1 (patch-Makefile.in) = b580cf5969febf3e4bb3b4229369d601b7444638 +SHA1 (patch-w3m.el) = a4c14deed274e984f854255513ce49dbd320eb83 +SHA1 (patch-w3mhack.el) = ecb7448d7f79b37e2b3229e11f9079062728ebf7 diff --git a/www/emacs-w3m-snapshot/options.mk b/www/emacs-w3m-snapshot/options.mk index 79c78d603d2..547e33dd9ba 100644 --- a/www/emacs-w3m-snapshot/options.mk +++ b/www/emacs-w3m-snapshot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2009/08/07 15:35:10 minskim Exp $ +# $NetBSD: options.mk,v 1.2 2013/03/04 19:12:22 hiramatsu Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs-w3m PKG_SUPPORTED_OPTIONS= emacs-w3m-mew @@ -7,6 +7,7 @@ PKG_SUPPORTED_OPTIONS= emacs-w3m-mew PLIST_VARS+= mew .if !empty(PKG_OPTIONS:Memacs-w3m-mew) +MAKE_ENV+= EMACS-W3M-MEW=1 .include "../../mail/mew/buildlink3.mk" PLIST.mew= yes .endif diff --git a/www/emacs-w3m-snapshot/patches/patch-Makefile.in b/www/emacs-w3m-snapshot/patches/patch-Makefile.in new file mode 100644 index 00000000000..527a9827f8b --- /dev/null +++ b/www/emacs-w3m-snapshot/patches/patch-Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-Makefile.in,v 1.1 2013/03/04 19:12:23 hiramatsu Exp $ + +Compile mew-shimbun.el and mew-w3m.el when +emacs-w3m-mew option is set. + +--- Makefile.in.orig 2013-02-27 14:07:25.000000000 +0900 ++++ Makefile.in 2013-02-27 14:07:38.000000000 +0900 +@@ -40,7 +40,7 @@ + lisp: Makefile + env test ! -f w3m-util.elc -o w3m-util.elc -nt w3m-util.el || $(MAKE) clean + env test ! -f w3m-proc.elc -o w3m-proc.elc -nt w3m-proc.el || $(MAKE) clean +- $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-compile ++ $(MAKE_ENV) $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-compile + + # `w3mhack-what-where' respects DESTDIR + what-where: diff --git a/www/emacs-w3m-snapshot/patches/patch-w3m.el b/www/emacs-w3m-snapshot/patches/patch-w3m.el index 334bc9cf0d5..52cbf9c3204 100644 --- a/www/emacs-w3m-snapshot/patches/patch-w3m.el +++ b/www/emacs-w3m-snapshot/patches/patch-w3m.el @@ -1,8 +1,10 @@ -$NetBSD: patch-w3m.el,v 1.1 2011/11/30 21:05:13 minskim Exp $ +$NetBSD: patch-w3m.el,v 1.2 2013/03/04 19:12:23 hiramatsu Exp $ ---- w3m.el.orig 2010-05-19 05:12:47.000000000 +0000 -+++ w3m.el -@@ -243,13 +243,13 @@ The valid values include `w3m', `w3mmee' +Use an absolute path in invoking w3m. + +--- w3m.el.orig 2013-02-25 15:15:04.000000000 +0900 ++++ w3m.el 2013-02-25 15:16:14.000000000 +0900 +@@ -259,13 +259,13 @@ ;; Set w3m-command, w3m-type, w3m-version and w3m-compile-options (if noninteractive ;; Don't call the external command when compiling. (unless w3m-command diff --git a/www/emacs-w3m-snapshot/patches/patch-w3mhack.el b/www/emacs-w3m-snapshot/patches/patch-w3mhack.el new file mode 100644 index 00000000000..2e317633bd1 --- /dev/null +++ b/www/emacs-w3m-snapshot/patches/patch-w3mhack.el @@ -0,0 +1,16 @@ +$NetBSD: patch-w3mhack.el,v 1.1 2013/03/04 19:12:23 hiramatsu Exp $ + +Compile mew-shimbun.el and mew-w3m.el when +emacs-w3m-mew option is set. + +--- w3mhack.el.orig 2013-02-27 13:42:17.000000000 +0900 ++++ w3mhack.el 2013-02-27 13:42:45.000000000 +0900 +@@ -311,7 +311,7 @@ + 2)) + (error nil)) + t))) +- (locate-library "mew")) ++ (and (locate-library "mew") (getenv "EMACS-W3M-MEW"))) + (push "mew-w3m.el" ignores)) + (unless (if (featurep 'xemacs) + (and (featurep 'mule) (locate-library "pccl")) |