diff options
author | R. Imura <imura@FreeBSD.org> | 2000-01-30 16:23:57 +0000 |
---|---|---|
committer | R. Imura <imura@FreeBSD.org> | 2000-01-30 16:23:57 +0000 |
commit | 478cafc84fb309fe828906063445a7fd275e8b8e (patch) | |
tree | 138004449345450c4b62d8d2616fa6ac598cfc2a /www | |
parent | Fix compiler error in -current. (diff) |
Update to version 0.1.7.
PR: 16448
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=25316
Diffstat (limited to 'www')
-rw-r--r-- | www/w3m/Makefile | 18 | ||||
-rw-r--r-- | www/w3m/distinfo | 2 | ||||
-rw-r--r-- | www/w3m/files/patch-aa | 32 | ||||
-rw-r--r-- | www/w3m/files/patch-ae | 42 | ||||
-rw-r--r-- | www/w3m/files/patch-ak | 8 | ||||
-rw-r--r-- | www/w3m/files/patch-ao | 16 | ||||
-rw-r--r-- | www/w3m/pkg-plist | 4 | ||||
-rw-r--r-- | www/w3m/pkg-plist.ja | 5 |
8 files changed, 69 insertions, 58 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 757a460552ca..da03df24cc45 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,20 +1,18 @@ # New ports collection makefile for: w3m -# Version required: 991028-2 +# Version required: 0.1.7 # Date Created: 7 Oct 1999 # Whom: MANTANI Nobutaka <nobutaka@nobutaka.com> # # $FreeBSD$ # -DISTNAME= w3m-${W3M_DIST_VER} -PKGNAME?= w3m-${W3M_VER} -W3M_DIST_VER= 991203 -W3M_VER= ${W3M_DIST_VER} +DISTNAME= w3m-${W3M_VER} +W3M_VER= 0.1.7 CATEGORIES?= www ipv6 -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/ +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/ MAINTAINER= nobutaka@nobutaka.com @@ -27,7 +25,7 @@ MAN1= w3m.1 MANLANG= "" TARGET= ${WRKSRC}/config.h -DOCS= FAQ.html MANUAL.html MANUAL_lynx.html README \ +DOCS= FAQ.html HISTORY MANUAL.html README \ README.dict README.func STORY.html keymap.default \ keymap.lynx menu.default menu.submenu SED_CMD= -e "s,%%PREFIX%%,${PREFIX},g" \ diff --git a/www/w3m/distinfo b/www/w3m/distinfo index 8f23a30f783a..934743822b30 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1 +1 @@ -MD5 (w3m-991203.tar.gz) = 26339b5854d53ac185cf7904fa903c18 +MD5 (w3m-0.1.7.tar.gz) = 113644aea9749224ac961ffa3c24766a diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa index 05bbd2e0cdcd..77a08cfc76c3 100644 --- a/www/w3m/files/patch-aa +++ b/www/w3m/files/patch-aa @@ -1,35 +1,32 @@ ---- config.h.orig Thu Dec 2 13:12:36 1999 -+++ config.h Mon Dec 6 03:21:06 1999 -@@ -49,18 +49,20 @@ +--- config.h.orig Fri Jan 28 09:48:51 2000 ++++ config.h Fri Jan 28 18:53:34 2000 +@@ -59,19 +59,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 +-SYS_LIBRARIES = -lgpm -lbsd -lncurses -L/usr/local/ssl/lib -lssl -lcrypto +BIN_DIR = %%PREFIX%%/bin -+LIB_DIR = %%PREFIX%%/libexec/w3m +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 -+#CC = gcc -+#MYCFLAGS = -g -I./gc +-MYCFLAGS = -g -I./gc -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include KEYBIND_SRC = keybind.c KEYBIND_OBJ = keybind.o EXT= -GCLIB=gc/gc.a -GCTARGET=gc/gc.a -+#GCLIB=gc/gc.a -+#GCTARGET=gc/gc.a + RANLIB=ranlib + MKDIR=mkdir -p #else - - -@@ -68,21 +70,30 @@ +@@ -81,23 +78,31 @@ #define JA 0 #define EN 1 @@ -43,19 +40,22 @@ #define COLOR #define MOUSE -#define USE_GPM +-#undef USE_SYSMOUSE +#undef USE_GPM ++#define USE_SYSMOUSE #define MENU #define USE_COOKIE - #undef USE_SSL +-#define USE_SSL ++#undef USE_SSL --#define DEF_EDITOR "/bin/vi" + #define DEF_EDITOR "/usr/bin/vi" -#define DEF_MAILER "/bin/mail" -#define DEF_EXT_BROWSER "/usr/local/bin/netscape" -+#define DEF_EDITOR "/usr/bin/vi" +#define DEF_MAILER "/usr/bin/mail" +#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape" -#define LIB_DIR "/usr/local/lib/w3m" +-#define HELP_DIR "/usr/local/lib/w3m" -#define HELP_FILE "w3mhelp.html" +#define LIB_DIR "%%PREFIX%%/libexec/w3m" +#ifdef JAPANESE diff --git a/www/w3m/files/patch-ae b/www/w3m/files/patch-ae index 541e0228f899..e4c7e3bf33cb 100644 --- a/www/w3m/files/patch-ae +++ b/www/w3m/files/patch-ae @@ -1,18 +1,16 @@ ---- XMakefile.orig Fri Dec 3 10:57:55 1999 -+++ XMakefile Mon Dec 6 03:12:50 1999 -@@ -17,16 +17,16 @@ +--- XMakefile.orig Fri Jan 28 08:38:16 2000 ++++ XMakefile Fri Jan 28 18:55:34 2000 +@@ -18,14 +18,14 @@ INCLUDES=-I. -DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG -CFLAGS=$(MYCFLAGS) $(DEFS) --LIBS=-L. -laa $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +-LIBS=-L. -lindep $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG +CFLAGS+=$(MYCFLAGS) $(DEFS) -+LIBS+=$(ALIB) -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) ++LIBS+=-L. -lindep -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) INSTALL=sh install.sh - INSTALL2=sh ../install.sh - RANLIB=ranlib all: $(TARGETS) @@ -21,31 +19,27 @@ $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) $(ALIB): $(ALIBOBJS) -@@ -48,25 +48,26 @@ - cd gc; make CC='$(CC) $(MYCFLAGS)' - +@@ -66,23 +66,24 @@ install: $(TARGETS) -- -mkdir $(DESTDIR)$(BIN_DIR) -- -mkdir $(DESTDIR)$(HELP_DIR) + -$(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-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 -- $(INSTALL) -m 755 $(BOOKMARKER) $(DESTDIR)$(HELP_DIR)/$(BOOKMARKER) -- (cd scripts; for i in *; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(HELP_DIR)/$$i; done) -+ -mkdir -p $(DESTDIR)$(BIN_DIR) -+ -mkdir -p $(DESTDIR)$(LIB_DIR) -+ -mkdir -p $(DESTDIR)$(HELP_DIR) -+ -mkdir -p $(DESTDIR)$(HELP_DIR_JA) +- 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 -+ $(BSD_INSTALL_PROGRAM) -m 755 $(BOOKMARKER) $(DESTDIR)$(LIB_DIR)/$(BOOKMARKER) -+ (cd scripts; for i in *; do $(BSD_INSTALL_SCRIPT) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done) ++ 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) uninstall: -$(RM) $(BIN_DIR)/$(TARGET) @@ -54,10 +48,10 @@ + -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html -$(RM) $(HELP_DIR)/w3mhelp_en.html - -$(RM) $(HELP_DIR)/w3mhelp_ja.html +- -$(RM) $(HELP_DIR)/w3mhelp.html + -$(RM) $(HELP_DIR_JA)/w3mhelp_ja.html - -$(RM) $(HELP_DIR)/w3mhelp.html -- -$(RM) $(HELP_DIR)/$(BOOKMARKER) + -$(RM) $(LIB_DIR)/$(BOOKMARKER) ++ -$(RM) $(LIB_DIR)/$(HELPER) - clean: - rm -f *.o $(TARGETS) $(ALIB) mktable tagtable.c + clean: sweep + rm -f *.o *.a $(TARGETS) mktable diff --git a/www/w3m/files/patch-ak b/www/w3m/files/patch-ak index 6bd70a6b11b2..408ed4694641 100644 --- a/www/w3m/files/patch-ak +++ b/www/w3m/files/patch-ak @@ -1,10 +1,10 @@ ---- main.c.orig Mon Dec 6 01:55:23 1999 -+++ main.c Mon Dec 6 01:56:00 1999 -@@ -1032,7 +1032,7 @@ +--- main.c.orig Fri Jan 28 14:38:59 2000 ++++ main.c Fri Jan 28 18:57:39 2000 +@@ -1087,7 +1087,7 @@ void ldhelp(void) { -- cmd_loadURL(libFile(HELP_FILE), NULL); +- cmd_loadURL(helpFile(HELP_FILE), NULL); + cmd_loadURL(HELP_FILE, NULL); } diff --git a/www/w3m/files/patch-ao b/www/w3m/files/patch-ao new file mode 100644 index 000000000000..9b00512431d3 --- /dev/null +++ b/www/w3m/files/patch-ao @@ -0,0 +1,16 @@ +--- 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); + } +- +-char * +-helpFile(char *base) +-{ +- Str file = Strnew_charp(HELP_DIR); +- +- Strcat_char(file, '/'); +- Strcat_charp(file, base); +- return expandName(file->ptr); +-} diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist index 4e8f3095f2d4..8c0abd44447c 100644 --- a/www/w3m/pkg-plist +++ b/www/w3m/pkg-plist @@ -1,11 +1,13 @@ 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/w3m/FAQ.html +share/doc/w3m/HISTORY share/doc/w3m/MANUAL.html -share/doc/w3m/MANUAL_lynx.html share/doc/w3m/README share/doc/w3m/README.dict share/doc/w3m/README.func diff --git a/www/w3m/pkg-plist.ja b/www/w3m/pkg-plist.ja index 4302062a2f0c..b6521070ce0e 100644 --- a/www/w3m/pkg-plist.ja +++ b/www/w3m/pkg-plist.ja @@ -1,11 +1,12 @@ bin/w3m libexec/w3m/dirlist.cgi +libexec/w3m/dirlist2.cgi libexec/w3m/w3mbookmark +libexec/w3m/w3mhelperpanel share/doc/ja/w3m/FAQ.html share/doc/ja/w3m/HISTORY share/doc/ja/w3m/HISTORY.kokb share/doc/ja/w3m/MANUAL.html -share/doc/ja/w3m/MANUAL_lynx.html share/doc/ja/w3m/README share/doc/ja/w3m/README.dict share/doc/ja/w3m/README.func @@ -20,8 +21,8 @@ share/doc/ja/w3m/menu.submenu share/doc/ja/w3m/w3mhelp-lynx_ja.html share/doc/ja/w3m/w3mhelp_ja.html share/doc/w3m/FAQ.html +share/doc/w3m/HISTORY share/doc/w3m/MANUAL.html -share/doc/w3m/MANUAL_lynx.html share/doc/w3m/README share/doc/w3m/README.dict share/doc/w3m/README.func |