Update to version 991028-2.

PR:		14691
Submitted by:	maintainer
This commit is contained in:
Steve Price 1999-11-14 02:02:07 +00:00
parent 35efb976e9
commit c82ac0c27d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=23074
11 changed files with 236 additions and 50 deletions

View file

@ -1,40 +1,83 @@
# New ports collection makefile for: w3m
# Version required: 990928
# Version required: 991028-2
# Date Created: 7 Oct 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
# $FreeBSD$
#
DISTNAME= w3m-990928
DISTNAME= w3m-${W3M_DIST_VER}
PKGNAME?= w3m-${W3M_VER}
W3M_DIST_VER= 991028-2
W3M_VER= 991028.2
CATEGORIES?= www
MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
ftp://ftp.firedrake.org/w3m/
ftp://ftp.firedrake.org/w3m/ \
http://www.instinct.org/~pgl/w3m/ \
http://grilli.net/mirrors/w3m/download/
MAINTAINER= nobutaka@nobutaka.com
WRKSRC= ${WRKDIR}/w3m
TARGET= ${WRKSRC}/config.h
RESTRICTED= "Contains cryptography"
.if !defined(JAPANESE_MSG)
pre-extract:
@${ECHO} "Try ports/japanese/w3m if you prefer Japanese messages."
BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
WRKSRC= ${WRKDIR}/w3m
MAN1= w3m.1
MANLANG= ""
TARGET= ${WRKSRC}/config.h
DOCS= FAQ.html MANUAL.html MANUAL_lynx.html README \
README.dict README.func STORY.html keymap.default \
keymap.lynx menu.default menu.submenu
SED_CMD= -e "s,%%PREFIX%%,${PREFIX},g" \
-e "s,%%LOCALBASE%%,${LOCALBASE},g"
.if defined(JAPANESE)
SED_CMD+= -e "s,undef JAPANESE,define JAPANESE,g" \
-e "s,w3mhelp_en.html,w3mhelp_ja.html,g"
MANLANG+= ja
DOCS_JP= ${DOCS} HISTORY HISTORY.kokb README.keymap README.kokb \
README.menu
.endif
.if defined(USE_SSL)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.a:${PORTSDIR}/security/openssl \
${LOCALBASE}/lib/libssl.a:${PORTSDIR}/security/openssl
SSL_CFLAGS= -I${LOCALBASE}/include/openssl
SSL_LIBS= -lssl -lcrypto
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
EXTRA_SSL_LIBS= -lRSAglue -lrsaref
.endif
SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g"
.endif
MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include ${SSL_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lgc ${SSL_LIBS} ${EXTRA_SSL_LIBS}"
post-configure:
@${CP} ${TARGET} ${TARGET}.in
.if defined(JAPANESE_MSG)
@${SED} \
-e "s,%%PREFIX%%,${PREFIX},g" \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,#undef JAPANESE_MSG,#define JAPANESE_MSG,g" \
-e "s,w3mhelp_en.html,w3mhelp_ja.html,g" \
< ${TARGET}.in > ${TARGET}
.else
@${SED} \
-e "s,%%PREFIX%%,${PREFIX},g" \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
< ${TARGET}.in > ${TARGET}
@${SED} ${SED_CMD} < ${TARGET}.in > ${TARGET}
post-install:
.if !defined(NOPORTDOCS)
.if defined(JAPANESE)
@${MKDIR} ${PREFIX}/share/doc/ja/w3m
@(cd ${WRKSRC}/doc-jp; \
for i in ${DOCS_JP} ; do \
${INSTALL_DATA} $$i ${PREFIX}/share/doc/ja/w3m/ ; \
done)
.endif
@(cd ${WRKSRC}/doc; \
for i in ${DOCS} ; do \
${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
done)
.endif
@${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
.if defined(JAPANESE)
@${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${PREFIX}/man/ja/man1
.endif
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (w3m-990928.tar.gz) = c1a2c8af0be16bb8b2b159461a6d7979
MD5 (w3m-991028-2.tar.gz) = 811581cdd25b1ccbeb419e4db1cdcf0d

View file

@ -1,48 +1,66 @@
--- config.h.orig Tue Sep 28 03:58:56 1999
+++ config.h Mon Oct 11 17:35:48 1999
@@ -28,13 +28,13 @@
--- config.h.orig Wed Oct 27 07:04:00 1999
+++ config.h Tue Nov 2 17:14:55 1999
@@ -28,18 +28,19 @@
/**********************************************************/
#ifdef makefile_parameter
-BIN_DIR = /usr/local/bin
-HELP_DIR = /usr/local/lib
-HELP_DIR = /usr/local/lib/w3m
-HELP_FILE = w3mhelp_ja.html
-SYS_LIBRARIES = -lbsd -lnsl -ltermcap
-SYS_LIBRARIES = -lbsd -lnsl -lncurses
+BIN_DIR = %%PREFIX%%/bin
+HELP_DIR = %%PREFIX%%/share/doc/w3m
+HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m
+HELP_FILE = w3mhelp_en.html
+SYS_LIBRARIES = -ltermcap
LOCAL_LIBRARIES =
-CC = gcc
-MYCFLAGS = -g -I./gc
-MYCFLAGS = -g -I./gc
+#CC = gcc
+MYCFLAGS = -I./gc
+#MYCFLAGS = -g -I./gc
KEYBIND_SRC = keybind.c
KEYBIND_OBJ = keybind.o
EXT=
@@ -48,15 +48,19 @@
-GCLIB=gc/gc.a
-GCTARGET=gc/gc.a
+#GCLIB=gc/gc.a
+#GCTARGET=gc/gc.a
#else
@@ -47,19 +48,28 @@
#define JA 0
#define EN 1
+#undef JAPANESE
+#ifdef JAPANESE
#define LANG JA
-#define KANJI_SYMBOLS
#define COLOR
-#define MOUSE
+#undef MOUSE
#define MENU
+#undef JAPANESE_MSG
+
+#ifdef JAPANESE_MSG
+#define KANJI_SYMBOLS
#define KANJI_SYMBOLS
+#else
+#define LANG EN
+#endif
#define COLOR
-#undef MOUSE
+#define MOUSE
#define MENU
-#undef USE_COOKIE
+#define USE_COOKIE
#undef USE_SSL
-#define DEF_EDITOR "/bin/vi"
-#define DEF_MAILER "/bin/mail"
-#define DEF_EXT_BROWSER "/usr/bin/lynx"
-#define HELP_FILE "/usr/local/lib/w3mhelp.html"
-#define LIB_DIR "/usr/local/lib/w3m"
-#define HELP_FILE "/usr/local/lib/w3m/w3mhelp.html"
+#define DEF_EDITOR "/usr/bin/vi"
+#define DEF_MAILER "/usr/bin/mail"
+#define DEF_EXT_BROWSER "%%LOCALBASE%%/bin/netscape"
+#define HELP_FILE "%%LOCALBASE%%/share/doc/w3m/w3mhelp.html"
+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
+#define LIB_DIR "%%PREFIX%%/lib/w3m"
+#ifdef JAPANESE
+#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp_ja.html"
+#else
+#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp_en.html"
+#endif
#define BOOKMARK "~/.w3m/bookmark.html"
#define KEYMAP_FILE "~/.w3m/keymap"
#define MENU_FILE "~/.w3m/menu"

View file

@ -1,11 +1,47 @@
--- XMakefile.orig Tue Sep 28 04:00:53 1999
+++ XMakefile Mon Oct 11 17:35:10 1999
@@ -15,7 +15,7 @@
--- XMakefile.orig Thu Oct 28 12:09:40 1999
+++ XMakefile Tue Nov 2 17:20:30 1999
@@ -14,9 +14,9 @@
INCLUDES=-I.
DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
-DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS)
-LIBS=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
+CFLAGS+=$(MYCFLAGS) $(DEFS)
LIBS=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+LIBS+=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
INSTALL=sh install.sh
$(TARGET): $(ALLOBJS) $(GCTARGET)
@@ -28,21 +28,21 @@
cd gc; make CC='$(CC) $(MYCFLAGS)'
install: $(TARGET)
- -mkdir $(DESTDIR)$(BIN_DIR)
- -mkdir $(DESTDIR)$(HELP_DIR)
- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)
- $(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)
- $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)
- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)
- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)
- $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
+ -mkdir -p $(DESTDIR)$(BIN_DIR)
+ -mkdir -p $(DESTDIR)$(HELP_DIR)
+ -mkdir -p $(DESTDIR)$(HELP_DIR_JA)
+ ${BSD_INSTALL_PROGRAM} $(TARGET) $(DESTDIR)$(BIN_DIR)
+ ${BSD_INSTALL_DATA} w3mhelp_en.html $(DESTDIR)$(HELP_DIR)
+ ${BSD_INSTALL_DATA} w3mhelp_ja.html $(DESTDIR)$(HELP_DIR_JA)
+ ${BSD_INSTALL_DATA} w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)
+ ${BSD_INSTALL_DATA} w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)
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_JA)/w3mhelp_ja.html
-$(RM) $(HELP_DIR)/w3mhelp.html
clean: sweep

11
www/w3m/files/patch-ag Normal file
View file

@ -0,0 +1,11 @@
--- w3mhelp_en.html.orig Thu Oct 7 12:17:27 1999
+++ w3mhelp_en.html Fri Oct 15 20:40:03 1999
@@ -12,7 +12,7 @@
***** Key assign table *****
</CENTER>
-<A HREF="w3mhelp_ja.html">Japanese</A>
+<A HREF="../ja/w3m/w3mhelp_ja.html">Japanese</A>
<H2>Page/Cursor motion</H2>
<table>

11
www/w3m/files/patch-ah Normal file
View file

@ -0,0 +1,11 @@
--- w3mhelp_ja.html.orig Thu Oct 7 12:18:45 1999
+++ w3mhelp_ja.html Fri Oct 15 20:40:03 1999
@@ -14,7 +14,7 @@
***** キー割り当て *****
</CENTER>
-<A HREF="w3mhelp_en.html">English</A>
+<A HREF="../../w3m/w3mhelp_en.html">English</A>
<H2>ページ/カーソル移動</H2>
<TABLE>

11
www/w3m/files/patch-ai Normal file
View file

@ -0,0 +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
@@ -12,7 +12,7 @@
***** Key assign table *****
</CENTER>
-<A HREF="w3mhelp_ja.html">Japanese</A>
+<A HREF="../ja/w3m/w3mhelp_ja.html">Japanese</A>
<H3>Page/Cursor motion</H3>
<table>

11
www/w3m/files/patch-aj Normal file
View file

@ -0,0 +1,11 @@
--- w3mhelp-lynx_ja.html.orig Thu Oct 7 12:18:16 1999
+++ w3mhelp-lynx_ja.html Fri Oct 15 20:40:03 1999
@@ -14,7 +14,7 @@
***** lynx-like キー割り当て *****
</CENTER>
-<A HREF="w3mhelp-lynx_en.html">English</A>
+<A HREF="../../w3m/w3mhelp-lynx_en.html">English</A>
<H3>ページ/カーソル移動</H3>
<table>

View file

@ -1 +1 @@
a pager/text-based WWW browser
A pager/text-based WWW browser

View file

@ -1,7 +1,18 @@
bin/w3m
share/doc/ja/w3m/w3mhelp-lynx_ja.html
share/doc/ja/w3m/w3mhelp_ja.html
share/doc/w3m/FAQ.html
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
share/doc/w3m/STORY.html
share/doc/w3m/keymap.default
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-lynx_ja.html
share/doc/w3m/w3mhelp.html
share/doc/w3m/w3mhelp_en.html
share/doc/w3m/w3mhelp_ja.html
@dirrm share/doc/ja/w3m
@dirrm share/doc/w3m

34
www/w3m/pkg-plist.ja Normal file
View file

@ -0,0 +1,34 @@
bin/w3m
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
share/doc/ja/w3m/README.keymap
share/doc/ja/w3m/README.kokb
share/doc/ja/w3m/README.menu
share/doc/ja/w3m/STORY.html
share/doc/ja/w3m/keymap.default
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/w3m/FAQ.html
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
share/doc/w3m/STORY.html
share/doc/w3m/keymap.default
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
@dirrm share/doc/ja/w3m
@dirrm share/doc/w3m