cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.2.2; w3m is now hosted on SourceForge.

Browse Source 
Radical pruning to make this port manageable again:
- Remove image and m17n flavors.  The corresponding functionality
  may eventually return in some other form.
- Rename kanji flavor to "japanese".
This commit is contained in:
naddy 2001-11-16 21:35:44 +00:00
parent ca7dac35ad
commit d33058c6c2
15 changed files with 52 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
www/w3m/Makefile
View File

@ -1,25 +1,14 @@
# $OpenBSD: Makefile,v 1.30 2001/11/05 15:40:07 naddy Exp $
# $OpenBSD: Makefile,v 1.31 2001/11/16 21:35:44 naddy Exp $
ONLY_FOR_ARCHS= i386 sparc m68k
COMMENT= "text-based web browser/pager"
COMMENT-kanji= "Japanese text-based web browser/pager"
COMMENT-image= "text-based web browser/pager with inline image support"
COMMENT-m17n= "multi-script text-based web browser/pager"
COMMENT-kanji-m17n= "Japanese multi-script text-based web browser/pager"
COMMENT-kanji-image= "Japanese text-based web browser/pager with image support"
V_AITO= 0.2.1 # aito's official release
V_INU= 1.5 # inu branch
V_IMG= 1.12 # image extension
V_M17N= 0.19 # multilingualization extension
AITO_DISTNAME= w3m-${V_AITO}
INU_DISTNAME= w3m-${V_AITO}-inu-${V_INU}
COMMENT-japanese= "Japanese text-based web browser/pager"
DISTNAME= w3m-0.2.2
CATEGORIES= www
NEED_VERSION= 1.474
HOMEPAGE= http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/
NEED_VERSION= 1.498
HOMEPAGE= http://w3m.sourceforge.net/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -28,25 +17,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
http://www.instinct.org/w3m/ \
ftp://ftp.wiretapped.net/pub/w3m/
MASTER_SITES0= http://mi.med.tohoku.ac.jp/~satodai/w3m/inu/200110/
MASTER_SITES1= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= w3m
INU_DISTFILE= ${INU_DISTNAME}${EXTRACT_SUFX}:0
IMG_PATCH= w3m-${V_AITO}-inu-${V_INU}-img-${V_IMG}.patch:1
M17N_PATCH= w3m-${V_AITO}-m17n-${V_M17N}.patch.gz:1
PATCH_DIST_STRIP= -p1
SUPDISTFILES= ${AITO_DISTNAME}${EXTRACT_SUFX} ${INU_DISTFILE} \
${IMG_PATCH} ${M17N_PATCH}
FLAVORS= kanji image m17n
FLAVORS= japanese
FLAVOR?=
PATCH_LIST= patch-*
CONFIGURE_STYLE= simple
CONFIGURE_ARGS= -nonstop -prefix="${PREFIX}" -cflags="${CFLAGS}" \
-model=monster
@ -55,53 +31,13 @@ CONFIGURE_ENV= use_nntp=y use_ssl_verify=y \
dtermlib="${TERMLIB}" def_helpdir="${PREFIX}/share/w3m" \
def_libdir="${PREFIX}/libexec/w3m"
NO_REGRESS= Yes
DOCS= FAQ.html HISTORY MANUAL.html \
README README.dict README.func STORY.html \
keymap.default keymap.lynx menu.default menu.submenu
.if ${FLAVOR:L:Mimage} && ${FLAVOR:L:Mm17n}
ERRORS+= "Fatal: Flavors 'image' and 'm17n' are mutually exclusive."
.endif
.if ${FLAVOR:L:Mjapanese}
.if ${FLAVOR:L:Mimage}
DISTNAME= ${INU_DISTNAME}
PKGNAME= w3m-${V_AITO}.inu.${V_INU}.${V_IMG}
DISTFILES= ${INU_DISTFILE}
PATCHFILES= ${IMG_PATCH}
HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/
DOCS+= README.img
LIB_DEPENDS+= Imlib.19::graphics/imlib
.elif ${FLAVOR:L:Mm17n}
DISTNAME= ${AITO_DISTNAME}
PKGNAME= ${DISTNAME}.${V_M17N}p1
PATCHFILES= ${M17N_PATCH}
HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/
CONFIGURE_ARGS+= -suffix="" -charset=UTF-8
DOCS+= README.m17n
PATCH_LIST+= m17n-*
.else
DISTNAME= ${INU_DISTNAME}
PKGNAME= w3m-${V_AITO}.inu.${V_INU}
DISTFILES= ${INU_DISTFILE}
.endif
.if ${FLAVOR:L:Mkanji}
. if ${FLAVOR:L:Mimage}
FULLPKGNAME= ja-${PKGNAME}-img
. elif ${FLAVOR:L:Mm17n}
FULLPKGNAME= ja-${PKGNAME}-m17n
. else
FULLPKGNAME= ja-${PKGNAME}
. endif
CATEGORIES+= japanese
CONFIGURE_ARGS+= -lang=ja -code=n
DOCS+= README.SSL README.cookie README.keymap \
@ -115,9 +51,14 @@ DOCSRC= ${WRKSRC}/doc
.endif
pre-build:
@cd ${WRKBUILD}/gc; ${MAKE_PROGRAM} clean
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
cd ${DOCSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/w3m
cd ${DOCSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/w3m
NO_REGRESS= Yes
.include <bsd.port.mk>

3
www/w3m/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (w3m-0.2.2.tar.gz) = 5c7f93827471fa86080a742b4bbaf51d
RMD160 (w3m-0.2.2.tar.gz) = 3281b083e1a16d83a0957db8af98d0ab4e7bef0a
SHA1 (w3m-0.2.2.tar.gz) = 93757dc398cf93306705ac56a424613bd31cc3d6

12
www/w3m/files/md5
View File

@ -1,12 +0,0 @@
MD5 (w3m-0.2.1-inu-1.5-img-1.12.patch) = ed148df5ba00061270b95e435fd0a495
MD5 (w3m-0.2.1-inu-1.5.tar.gz) = b1d41611bcbe8c5523450c0381f91541
MD5 (w3m-0.2.1-m17n-0.19.patch.gz) = 1d6fc2f1f273ed87ae9df1922fff4733
MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
RMD160 (w3m-0.2.1-inu-1.5-img-1.12.patch) = e1099a7dc4d80522fae6c3d5f6e38f9b80f5a7c7
RMD160 (w3m-0.2.1-inu-1.5.tar.gz) = 241ddf8e70879bb22348e8357af9c791f3ed6188
RMD160 (w3m-0.2.1-m17n-0.19.patch.gz) = 86435439b9a22cc46fb920d6280045298a6ae877
RMD160 (w3m-0.2.1.tar.gz) = 0571973bb1e3fc9073aa4c97dff7fac6b6a47f56
SHA1 (w3m-0.2.1-inu-1.5-img-1.12.patch) = c31fb6dacd9e0226e4a120d3c73850b0b82a99f9
SHA1 (w3m-0.2.1-inu-1.5.tar.gz) = 923f4f45bda5a26997b1e74ea7e28b383ad33bec
SHA1 (w3m-0.2.1-m17n-0.19.patch.gz) = fad1119054d27bff8683176ff0c02ba906535448
SHA1 (w3m-0.2.1.tar.gz) = 3ae98283f02f4faf05af76ee0b022f01c1301d29

29
www/w3m/patches/m17n-gc_gcconfig_h
View File

@ -1,29 +0,0 @@
$OpenBSD: m17n-gc_gcconfig_h,v 1.1 2001/10/24 12:23:32 naddy Exp $
--- gc/gcconfig.h.orig Thu Jul 6 15:46:53 2000
+++ gc/gcconfig.h Thu Jul 6 15:49:15 2000
@@ -22,6 +22,25 @@
/* Machine specific parts contributed by various people. See README file. */
+#if defined(__unix__) && !defined(unix)
+# define unix
+#endif
+#if defined(__i386__) && !defined(i386)
+# define i386
+#endif
+#if defined(__sparc__) && !defined(sparc)
+# define sparc
+#endif
+#if defined(__m68k__) && !defined(m68k)
+# define m68k
+#endif
+#if defined(__m88k__) && !defined(m88k)
+# define m88k
+#endif
+#if defined(__alpha__) && !defined(alpha)
+# define alpha
+#endif
+
/* First a unified test for Linux: */
# if defined(linux) || defined(__linux__)
# define LINUX

20
www/w3m/patches/m17n-indep_c
View File

@ -1,20 +0,0 @@
$OpenBSD: m17n-indep_c,v 1.1 2001/09/29 11:41:03 naddy Exp $
--- indep.c.orig Sat Sep 29 03:02:38 2001
+++ indep.c Sat Sep 29 03:03:32 2001
@@ -74,14 +74,14 @@ currentdir()
#endif /* __EMX__ */
char *
-cleanupName(char *name)
+cleanupName2(char *name, int flag)
{
char *buf, *p, *q;
buf = allocStr(name, 0);
p = buf;
q = name;
- while (*q != '\0' && *q != '?') {
+ while (*q != '\0' && (*q != '?' || ! flag)) {
if (strncmp(p, "/../", 4) == 0) { /* foo/bar/../FOO */
if (p - 2 == buf && strncmp(p - 2, "..", 2) == 0) {
/* ../../ */

13
www/w3m/patches/m17n-indep_h
View File

@ -1,13 +0,0 @@
$OpenBSD: m17n-indep_h,v 1.1 2001/09/29 11:41:03 naddy Exp $
--- indep.h.orig Sat Sep 29 03:03:43 2001
+++ indep.h Sat Sep 29 03:04:10 2001
@@ -20,7 +20,8 @@ extern char *getescapecmd(char **s);
extern char *allocStr(const char *s, int len);
extern int strCmp(const void *s1, const void *s2);
extern char *currentdir(void);
-extern char *cleanupName(char *name);
+extern char *cleanupName2(char *name, int flag);
+#define cleanupName(name) cleanupName2((name), TRUE)
extern char *expandPath(char *name);
extern char *strcasestr(char *s1, char *s2);
extern int strcasemstr(char *str, char *srch[], char **ret_ptr);

39
www/w3m/patches/m17n-url_c
View File

@ -1,39 +0,0 @@
$OpenBSD: m17n-url_c,v 1.1 2001/09/29 11:41:03 naddy Exp $
--- url.c.orig Sat Sep 29 03:04:23 2001
+++ url.c Sat Sep 29 03:07:39 2001
@@ -949,7 +949,7 @@ parseURL2(char *url, ParsedURL * pu, Par
pu->file = cleanupName(pu->file);
}
if (pu->scheme == SCM_LOCAL)
- pu->real_file = file_unquote(pu->file);
+ pu->real_file = cleanupName2(file_unquote(pu->file), FALSE);
}
}
@@ -1247,7 +1247,7 @@ openURL(char *url, ParsedURL * pu, Parse
Str tmp2 = Strnew_charp("#");
Strcat_charp(tmp2, pu->label);
pu->file = tmp2->ptr;
- pu->real_file = file_unquote(pu->file);
+ pu->real_file = cleanupName2(file_unquote(pu->file), FALSE);
pu->label = NULL;
}
else {
@@ -1284,7 +1284,7 @@ openURL(char *url, ParsedURL * pu, Parse
else if ((q = strchr(pu->file, '?')) != NULL) {
/* local CGI: GET */
p = Strnew_charp_n(pu->file, (int)(q - pu->file))->ptr;
- pu->real_file = file_unquote(p);
+ pu->real_file = cleanupName2(file_unquote(p), FALSE);
uf.stream = newFileStream(localcgi_get(pu->real_file, q + 1, option->referer),
(void (*)()) pclose);
if (uf.stream != NULL) {
@@ -1606,7 +1606,7 @@ add_index_file(ParsedURL * pu, URLFile *
}
p = Strnew_m_charp(pu->file, "/", file_quote(index_file), NULL)->ptr;
p = cleanupName(p);
- q = file_unquote(p);
+ q = cleanupName2(file_unquote(p), FALSE);
examineFile(q, uf);
if (uf->stream == NULL)
return;

31
www/w3m/patches/patch-configure
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-configure,v 1.2 2001/10/24 12:23:32 naddy Exp $
--- configure.orig Thu Oct 11 18:00:58 2001
+++ configure Thu Oct 11 18:01:30 2001
@@ -793,6 +793,7 @@ if [ -n "$extlib" ]; then
echo "additional library found: $extlib"
$OpenBSD: patch-configure,v 1.3 2001/11/16 21:35:45 naddy Exp $
--- configure.orig Thu Nov 15 01:32:13 2001
+++ configure Fri Nov 16 19:29:45 2001
@@ -859,6 +859,7 @@ else
inflate=
fi
+if false; then # always use the included gclib for now
gclib=''
gcinclude=''
gctarget=''
@@ -812,6 +813,7 @@ do
@@ -878,6 +879,7 @@ do
break
fi
done
@ -17,3 +17,22 @@ $OpenBSD: patch-configure,v 1.2 2001/10/24 12:23:32 naddy Exp $
case $sysname in
linux|Linux|LINUX|aix|Aix|AIX)
@@ -967,17 +969,7 @@ echo "dldflags='$ldflags'" >> config.par
echo "Checking machine dependency."
###### mime.types
-MIME_TYPES=""
-for d in /usr/lib /usr/local/lib $prefix/lib /usr/local/lib/mosaic /usr/local/mosaic /usr/local/netscape /usr/local/lib/netscape
-do
- if [ -f $d/mime.types ]; then
- MIME_TYPES="$d/mime.types"
- fi
-done
-if [ -z "$MIME_TYPES" ]; then
- echo "Global mime.types not found; Hope /usr/local/lib/mime.types works."
- MIME_TYPES=/usr/local/lib/mime.types
-fi
+MIME_TYPES=/var/www/conf/mime.types
####### ranlib
if ./which ranlib > /dev/null

11
www/w3m/pkg/DESCR
View File

@ -6,13 +6,8 @@ it has several features Lynx doesn't have:
* w3m can display documents from standard input
* w3m is small
The kanji flavor provides Japanese menus and documentation, and
properly displays Japanese characters in kterm.
The multilingualization (m17n) flavor allows to display pages in
all kinds of scripts and encodings in a UTF-8 xterm. (Experimental.)
The image flavor supports displaying inline images when run from
an X11 terminal emulator. (Experimental.)
Available flavors:
japanese - Provide Japanese menus and documentation, and
properly display Japanese characters in kterm.
WWW: ${HOMEPAGE}

4
www/w3m/pkg/PFRAG.image
View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PFRAG.image,v 1.1 2001/07/31 15:27:08 naddy Exp $
libexec/w3m/w3mimgdisplay
libexec/w3m/w3mimgsize
share/doc/w3m/README.img

2
www/w3m/pkg/PFRAG.kanji → www/w3m/pkg/PFRAG.japanese
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.kanji,v 1.1 2001/03/24 12:56:17 naddy Exp $
@comment $OpenBSD: PFRAG.japanese,v 1.1 2001/11/16 21:35:45 naddy Exp $
@pkgcfl w3m-*
share/doc/w3m/README.SSL
share/doc/w3m/README.cookie

2
www/w3m/pkg/PFRAG.m17n
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.m17n,v 1.1 2001/03/30 17:19:10 naddy Exp $
share/doc/w3m/README.m17n

2
www/w3m/pkg/PFRAG.no-japanese Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.no-japanese,v 1.1 2001/11/16 21:35:45 naddy Exp $
@pkgcfl ja-w3m-*

2
www/w3m/pkg/PFRAG.no-kanji
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.no-kanji,v 1.1 2001/03/24 12:56:17 naddy Exp $
@pkgcfl ja-w3m-*

8
www/w3m/pkg/PLIST
View File

@ -1,11 +1,10 @@
@comment $OpenBSD: PLIST,v 1.8 2001/07/31 15:27:08 naddy Exp $
%%kanji%%
!%%kanji%%
@comment $OpenBSD: PLIST,v 1.9 2001/11/16 21:35:45 naddy Exp $
%%japanese%%
!%%japanese%%
bin/w3m
libexec/w3m/dirlist.cgi
libexec/w3m/w3mbookmark
libexec/w3m/w3mhelperpanel
%%image%%
man/man1/w3m.1
share/doc/w3m/FAQ.html
share/doc/w3m/HISTORY
@ -13,7 +12,6 @@ share/doc/w3m/MANUAL.html
share/doc/w3m/README
share/doc/w3m/README.dict
share/doc/w3m/README.func
%%m17n%%
share/doc/w3m/STORY.html
share/doc/w3m/keymap.default
share/doc/w3m/keymap.lynx