diff options
-rw-r--r-- | www/w3m/Makefile | 27 | ||||
-rw-r--r-- | www/w3m/distinfo | 2 | ||||
-rw-r--r-- | www/w3m/files/patch-aa | 38 | ||||
-rw-r--r-- | www/w3m/files/patch-ae | 46 | ||||
-rw-r--r-- | www/w3m/files/patch-ag | 8 | ||||
-rw-r--r-- | www/w3m/files/patch-ah | 8 | ||||
-rw-r--r-- | www/w3m/files/patch-ai | 8 | ||||
-rw-r--r-- | www/w3m/files/patch-aj | 4 | ||||
-rw-r--r-- | www/w3m/files/patch-ak | 10 | ||||
-rw-r--r-- | www/w3m/files/patch-ao | 19 | ||||
-rw-r--r-- | www/w3m/pkg-plist | 5 | ||||
-rw-r--r-- | www/w3m/pkg-plist.ja | 5 |
12 files changed, 94 insertions, 86 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 68c422c1d01d..c0216139acf4 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -6,18 +6,17 @@ # PORTNAME= w3m -PORTVERSION?= ${W3M_VER} +PORTVERSION= 0.1.9 CATEGORIES+= www ipv6 -MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \ - ftp://ftp.firedrake.org/w3m/dev/ \ - http://www.instinct.org/~pgl/w3m/dev/ \ - http://grilli.net/mirrors/w3m/download/dev/ +MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \ + ftp://ftp.firedrake.org/w3m/ \ + http://www.instinct.org/~pgl/w3m/ \ + http://grilli.net/mirrors/w3m/download/ MAINTAINER= nobutaka@nobutaka.com BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc -W3M_VER= 0.1.7 WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= w3m.1 MANLANG= "" @@ -37,10 +36,9 @@ SED_CMD+= -e "s,undef INET6,define INET6,g" .endif .if defined(JAPANESE) -SED_CMD+= -e "s,undef JAPANESE,define JAPANESE,g" \ - -e "s,w3mhelp_en.html,w3mhelp_ja.html,g" +SED_CMD+= -e "s,undef JAPANESE,define JAPANESE,g" MANLANG+= ja -DOCS_JP= ${DOCS} HISTORY HISTORY.kokb README.keymap README.kokb \ +DOCS_JP= ${DOCS} HISTORY.kokb README.keymap README.kokb \ README.menu .endif @@ -48,7 +46,8 @@ DOCS_JP= ${DOCS} HISTORY HISTORY.kokb README.keymap README.kokb \ SSL_CFLAGS= -I${OPENSSLINC}/openssl -I${OPENSSLINC} SSL_LIBS= -L${OPENSSLLIB} -lssl -lcrypto -SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g" +SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g" \ + -e "s,undef USE_SSL_VERIFY, define USE_SSL_VERIFY,g" .if defined(OPENSSL_RSAREF) EXTRA_SSL_LIBS= -lRSAglue -lrsaref @@ -67,15 +66,15 @@ post-install: .if !defined(NOPORTDOCS) .if defined(JAPANESE) @${MKDIR} ${PREFIX}/share/doc/ja/w3m - @(cd ${WRKSRC}/doc-jp; \ + @cd ${WRKSRC}/doc-jp; \ for i in ${DOCS_JP} ; do \ ${INSTALL_DATA} $$i ${PREFIX}/share/doc/ja/w3m/ ; \ - done) + done .endif - @(cd ${WRKSRC}/doc; \ + @cd ${WRKSRC}/doc; \ for i in ${DOCS} ; do \ ${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \ - done) + done .endif @${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1 .if defined(JAPANESE) diff --git a/www/w3m/distinfo b/www/w3m/distinfo index 934743822b30..c636e0e8d26e 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1 +1 @@ -MD5 (w3m-0.1.7.tar.gz) = 113644aea9749224ac961ffa3c24766a +MD5 (w3m-0.1.9.tar.gz) = 311e36e3e2eb673c01dd9a63d78a9936 diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa index 77a08cfc76c3..f7445e448f64 100644 --- a/www/w3m/files/patch-aa +++ b/www/w3m/files/patch-aa @@ -1,32 +1,32 @@ ---- config.h.orig Fri Jan 28 09:48:51 2000 -+++ config.h Fri Jan 28 18:53:34 2000 -@@ -59,19 +59,16 @@ +--- config.h.orig Fri Apr 21 12:37:50 2000 ++++ config.h Sat Apr 22 06:22:36 2000 +@@ -64,20 +64,16 @@ /**********************************************************/ #ifdef makefile_parameter -BIN_DIR = /usr/local/bin -HELP_DIR = /usr/local/lib/w3m -LIB_DIR = /usr/local/lib/w3m --HELP_FILE = w3mhelp_ja.html --SYS_LIBRARIES = -lgpm -lbsd -lncurses -L/usr/local/ssl/lib -lssl -lcrypto +-HELP_FILE = w3mhelp-w3m_ja.html +-SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/local/ssl/lib -lssl -lcrypto +BIN_DIR = %%PREFIX%%/bin +HELP_DIR = %%PREFIX%%/share/doc/w3m +HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m +LIB_DIR = %%PREFIX%%/libexec/w3m -+HELP_FILE = w3mhelp_en.html +SYS_LIBRARIES = -lncurses LOCAL_LIBRARIES = -CC = gcc --MYCFLAGS = -g -I./gc -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include +-MYCFLAGS = -O -I./gc -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include KEYBIND_SRC = keybind.c KEYBIND_OBJ = keybind.o EXT= + MATHLIB=-lm -GCLIB=gc/gc.a -GCTARGET=gc/gc.a RANLIB=ranlib MKDIR=mkdir -p - #else -@@ -81,23 +78,31 @@ + VERSION=0.1.9 +@@ -89,26 +85,34 @@ #define JA 0 #define EN 1 @@ -46,22 +46,28 @@ #define MENU #define USE_COOKIE -#define USE_SSL +-#define USE_SSL_VERIFY +#undef USE_SSL ++#undef USE_SSL_VERIFY + #undef FTPPASS_HOSTNAMEGEN - #define DEF_EDITOR "/usr/bin/vi" --#define DEF_MAILER "/bin/mail" --#define DEF_EXT_BROWSER "/usr/local/bin/netscape" -+#define DEF_MAILER "/usr/bin/mail" -+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape" +-#define DEF_EDITOR "/bin/vi" +-#define DEF_MAILER "/bin/mail" +-#define DEF_EXT_BROWSER "/usr/X11R6/bin/netscape" +- -#define LIB_DIR "/usr/local/lib/w3m" -#define HELP_DIR "/usr/local/lib/w3m" -#define HELP_FILE "w3mhelp.html" ++#define DEF_EDITOR "/usr/bin/vi" ++#define DEF_MAILER "/usr/bin/mail" ++#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape" ++ +#define LIB_DIR "%%PREFIX%%/libexec/w3m" +#ifdef JAPANESE -+#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp_ja.html" ++#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp-w3m_ja.html" +#else -+#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp_en.html" ++#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp-w3m_en.html" +#endif #define W3MCONFIG "w3mconfig" diff --git a/www/w3m/files/patch-ae b/www/w3m/files/patch-ae index e4c7e3bf33cb..0fc2a7566d2c 100644 --- a/www/w3m/files/patch-ae +++ b/www/w3m/files/patch-ae @@ -1,16 +1,18 @@ ---- XMakefile.orig Fri Jan 28 08:38:16 2000 -+++ XMakefile Fri Jan 28 18:55:34 2000 -@@ -18,14 +18,14 @@ +--- XMakefile.orig Fri Apr 21 13:35:48 2000 ++++ XMakefile Sat Apr 22 06:51:43 2000 +@@ -18,16 +18,16 @@ INCLUDES=-I. --DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG +-DEFS=$(INCLUDES) # -DDEBUG -CFLAGS=$(MYCFLAGS) $(DEFS) --LIBS=-L. -lindep $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) -+DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG -+CFLAGS+=$(MYCFLAGS) $(DEFS) -+LIBS+=-L. -lindep -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) ++DEFS+=$(INCLUDES) # -DDEBUG ++CFLAGS+=$(DEFS) ++LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) INSTALL=sh install.sh + INSTALL2=sh ../install.sh + AR=ar all: $(TARGETS) @@ -19,37 +21,37 @@ $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) $(ALIB): $(ALIBOBJS) -@@ -66,23 +66,24 @@ +@@ -67,23 +67,24 @@ install: $(TARGETS) -$(MKDIR) $(DESTDIR)$(BIN_DIR) -$(MKDIR) $(DESTDIR)$(HELP_DIR) + -$(MKDIR) $(DESTDIR)$(HELP_DIR_JA) -$(MKDIR) $(DESTDIR)$(LIB_DIR) - $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) -- $(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html -- $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp_ja.html +- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html +- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html - $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html - $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html - $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html - for d in $(BOOKMARKER) $(HELPER); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done -- (cd scripts; ln -s ../install.sh .; for i in *.cgi; do $(INSTALL) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done) -+ $(BSD_INSTALL_PROGRAM) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) -+ $(BSD_INSTALL_DATA) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html -+ $(BSD_INSTALL_DATA) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp_ja.html -+ $(BSD_INSTALL_DATA) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html -+ $(BSD_INSTALL_DATA) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html -+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done -+ (cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done) +- (cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done) ++ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) ++ $(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html ++ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html ++ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html ++ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html ++ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done ++ cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done uninstall: -$(RM) $(BIN_DIR)/$(TARGET) -$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html - -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html + -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html - -$(RM) $(HELP_DIR)/w3mhelp_en.html -- -$(RM) $(HELP_DIR)/w3mhelp_ja.html + -$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html +- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html - -$(RM) $(HELP_DIR)/w3mhelp.html -+ -$(RM) $(HELP_DIR_JA)/w3mhelp_ja.html ++ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html + -$(RM) $(LIB_DIR)/$(BOOKMARKER) + -$(RM) $(LIB_DIR)/$(HELPER) diff --git a/www/w3m/files/patch-ag b/www/w3m/files/patch-ag index 6ee20014cf3f..67a6d97b2ce5 100644 --- a/www/w3m/files/patch-ag +++ b/www/w3m/files/patch-ag @@ -1,11 +1,11 @@ ---- w3mhelp_en.html.orig Thu Oct 7 12:17:27 1999 -+++ w3mhelp_en.html Fri Oct 15 20:40:03 1999 +--- w3mhelp-w3m_en.html.orig Wed Apr 5 14:08:01 2000 ++++ w3mhelp-w3m_en.html Fri Apr 7 02:09:24 2000 @@ -12,7 +12,7 @@ ***** Key assign table ***** </CENTER> --<A HREF="w3mhelp_ja.html">Japanese</A> -+<A HREF="../ja/w3m/w3mhelp_ja.html">Japanese</A> +-<A HREF="w3mhelp-w3m_ja.html">Japanese</A> ++<A HREF="../ja/w3m/w3mhelp-w3m_ja.html">Japanese</A> <H2>Page/Cursor motion</H2> <table> diff --git a/www/w3m/files/patch-ah b/www/w3m/files/patch-ah index e5cb805cccbb..da8697fe6eae 100644 --- a/www/w3m/files/patch-ah +++ b/www/w3m/files/patch-ah @@ -1,11 +1,11 @@ ---- w3mhelp_ja.html.orig Thu Oct 7 12:18:45 1999 -+++ w3mhelp_ja.html Fri Oct 15 20:40:03 1999 +--- w3mhelp-w3m_ja.html.orig Wed Apr 5 14:08:01 2000 ++++ w3mhelp-w3m_ja.html Fri Apr 7 02:09:41 2000 @@ -14,7 +14,7 @@ ***** キー割り当て ***** </CENTER> --<A HREF="w3mhelp_en.html">English</A> -+<A HREF="../../w3m/w3mhelp_en.html">English</A> +-<A HREF="w3mhelp-w3m_en.html">English</A> ++<A HREF="../../w3m/w3mhelp-w3m_en.html">English</A> <H2>ページ/カーソル移動</H2> <TABLE> diff --git a/www/w3m/files/patch-ai b/www/w3m/files/patch-ai index f0fa4c23e7c2..2d73a52c8895 100644 --- a/www/w3m/files/patch-ai +++ b/www/w3m/files/patch-ai @@ -1,11 +1,11 @@ ---- w3mhelp-lynx_en.html.orig Thu Oct 7 12:18:43 1999 -+++ w3mhelp-lynx_en.html Fri Oct 15 20:40:03 1999 +--- w3mhelp-lynx_en.html.orig Wed Apr 5 14:08:01 2000 ++++ w3mhelp-lynx_en.html Fri Apr 7 02:09:51 2000 @@ -12,7 +12,7 @@ ***** Key assign table ***** </CENTER> --<A HREF="w3mhelp_ja.html">Japanese</A> -+<A HREF="../ja/w3m/w3mhelp_ja.html">Japanese</A> +-<A HREF="w3mhelp-lynx_ja.html">Japanese</A> ++<A HREF="../ja/w3m/w3mhelp-lynx_ja.html">Japanese</A> <H3>Page/Cursor motion</H3> <table> diff --git a/www/w3m/files/patch-aj b/www/w3m/files/patch-aj index 289ed768cdc5..4922c75138e8 100644 --- a/www/w3m/files/patch-aj +++ b/www/w3m/files/patch-aj @@ -1,5 +1,5 @@ ---- w3mhelp-lynx_ja.html.orig Thu Oct 7 12:18:16 1999 -+++ w3mhelp-lynx_ja.html Fri Oct 15 20:40:03 1999 +--- w3mhelp-lynx_ja.html.orig Fri Feb 25 13:22:16 2000 ++++ w3mhelp-lynx_ja.html Fri Apr 7 02:10:09 2000 @@ -14,7 +14,7 @@ ***** lynx-like キー割り当て ***** </CENTER> diff --git a/www/w3m/files/patch-ak b/www/w3m/files/patch-ak index 408ed4694641..9f1e5a2221b0 100644 --- a/www/w3m/files/patch-ak +++ b/www/w3m/files/patch-ak @@ -1,11 +1,11 @@ ---- main.c.orig Fri Jan 28 14:38:59 2000 -+++ main.c Fri Jan 28 18:57:39 2000 -@@ -1087,7 +1087,7 @@ +--- main.c.orig Fri Apr 21 12:45:53 2000 ++++ main.c Sat Apr 22 06:35:44 2000 +@@ -1139,7 +1139,7 @@ void ldhelp(void) { -- cmd_loadURL(helpFile(HELP_FILE), NULL); -+ cmd_loadURL(HELP_FILE, NULL); +- cmd_loadURL(helpFile(HELP_FILE), NULL); ++ cmd_loadURL(HELP_FILE, NULL); } static void diff --git a/www/w3m/files/patch-ao b/www/w3m/files/patch-ao index 9b00512431d3..7e2ecdbc46ef 100644 --- a/www/w3m/files/patch-ao +++ b/www/w3m/files/patch-ao @@ -1,15 +1,18 @@ ---- rc.c.orig Fri Jan 28 09:46:07 2000 -+++ rc.c Fri Jan 28 18:58:17 2000 -@@ -540,13 +540,3 @@ - Strcat_charp(file, base); - return expandName(file->ptr); +--- rc.c.orig Sat Apr 22 06:47:16 2000 ++++ rc.c Sat Apr 22 06:47:24 2000 +@@ -762,16 +762,3 @@ + Strcat_charp(file, base); + return expandName(file->ptr); } - --char * +-char * -helpFile(char *base) -{ -- Str file = Strnew_charp(HELP_DIR); -- +-#ifdef __EMX__ +- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR)); +-#else /* not __EMX__ */ +- Str file = Strnew_charp(HELP_DIR); +-#endif /* not __EMX__ */ - Strcat_char(file, '/'); - Strcat_charp(file, base); - return expandName(file->ptr); diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist index 8c0abd44447c..a68ca3638050 100644 --- a/www/w3m/pkg-plist +++ b/www/w3m/pkg-plist @@ -1,10 +1,9 @@ bin/w3m libexec/w3m/dirlist.cgi -libexec/w3m/dirlist2.cgi libexec/w3m/w3mbookmark libexec/w3m/w3mhelperpanel share/doc/ja/w3m/w3mhelp-lynx_ja.html -share/doc/ja/w3m/w3mhelp_ja.html +share/doc/ja/w3m/w3mhelp-w3m_ja.html share/doc/w3m/FAQ.html share/doc/w3m/HISTORY share/doc/w3m/MANUAL.html @@ -17,7 +16,7 @@ share/doc/w3m/keymap.lynx share/doc/w3m/menu.default share/doc/w3m/menu.submenu share/doc/w3m/w3mhelp-lynx_en.html -share/doc/w3m/w3mhelp_en.html +share/doc/w3m/w3mhelp-w3m_en.html @dirrm libexec/w3m @dirrm share/doc/ja/w3m @dirrm share/doc/w3m diff --git a/www/w3m/pkg-plist.ja b/www/w3m/pkg-plist.ja index b6521070ce0e..f68ea3513bcc 100644 --- a/www/w3m/pkg-plist.ja +++ b/www/w3m/pkg-plist.ja @@ -1,6 +1,5 @@ bin/w3m libexec/w3m/dirlist.cgi -libexec/w3m/dirlist2.cgi libexec/w3m/w3mbookmark libexec/w3m/w3mhelperpanel share/doc/ja/w3m/FAQ.html @@ -19,7 +18,7 @@ share/doc/ja/w3m/keymap.lynx share/doc/ja/w3m/menu.default share/doc/ja/w3m/menu.submenu share/doc/ja/w3m/w3mhelp-lynx_ja.html -share/doc/ja/w3m/w3mhelp_ja.html +share/doc/ja/w3m/w3mhelp-w3m_ja.html share/doc/w3m/FAQ.html share/doc/w3m/HISTORY share/doc/w3m/MANUAL.html @@ -32,7 +31,7 @@ share/doc/w3m/keymap.lynx share/doc/w3m/menu.default share/doc/w3m/menu.submenu share/doc/w3m/w3mhelp-lynx_en.html -share/doc/w3m/w3mhelp_en.html +share/doc/w3m/w3mhelp-w3m_en.html @dirrm libexec/w3m @dirrm share/doc/ja/w3m @dirrm share/doc/w3m |