diff options
| -rw-r--r-- | www/w3m/Makefile | 18 | ||||
| -rw-r--r-- | www/w3m/distinfo | 2 | ||||
| -rw-r--r-- | www/w3m/files/patch-aa | 26 | ||||
| -rw-r--r-- | www/w3m/files/patch-ao | 12 |
4 files changed, 29 insertions, 29 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile index c0216139acf4..bd7b0baa1d8a 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -6,18 +6,18 @@ # PORTNAME= w3m -PORTVERSION= 0.1.9 +PORTVERSION= 0.1.11p 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/w3m/dev/ \ + http://grilli.net/mirrors/w3m/download/dev/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-pre/} MAINTAINER= nobutaka@nobutaka.com BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc -WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= w3m.1 MANLANG= "" CFLAGS= -pipe @@ -43,12 +43,11 @@ DOCS_JP= ${DOCS} HISTORY.kokb README.keymap README.kokb \ .endif .if defined(USE_OPENSSL) -SSL_CFLAGS= -I${OPENSSLINC}/openssl -I${OPENSSLINC} +SSL_CFLAGS= -I${OPENSSLINC}/openssl -I${OPENSSLINC} ${OPENSSL_CFLAGS} SSL_LIBS= -L${OPENSSLLIB} -lssl -lcrypto 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 .endif @@ -61,6 +60,9 @@ MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" post-configure: @${CP} ${TARGET} ${TARGET}.in @${SED} ${SED_CMD} < ${TARGET}.in > ${TARGET} + @${SED} -e "s,@PERL@,${PERL},g" \ + -e "s,@CYGWIN@,0,g" \ + < ${WRKSRC}/scripts/dirlist.in > ${WRKSRC}/scripts/dirlist.cgi post-install: .if !defined(NOPORTDOCS) diff --git a/www/w3m/distinfo b/www/w3m/distinfo index c636e0e8d26e..68b1ed59c344 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1 +1 @@ -MD5 (w3m-0.1.9.tar.gz) = 311e36e3e2eb673c01dd9a63d78a9936 +MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5 diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa index f7445e448f64..4fbbaa465173 100644 --- a/www/w3m/files/patch-aa +++ b/www/w3m/files/patch-aa @@ -1,6 +1,6 @@ ---- config.h.orig Fri Apr 21 12:37:50 2000 -+++ config.h Sat Apr 22 06:22:36 2000 -@@ -64,20 +64,16 @@ +--- config.h.orig Wed Jun 14 19:49:48 2000 ++++ config.h Fri Jul 7 18:59:48 2000 +@@ -69,20 +69,16 @@ /**********************************************************/ #ifdef makefile_parameter @@ -8,7 +8,7 @@ -HELP_DIR = /usr/local/lib/w3m -LIB_DIR = /usr/local/lib/w3m -HELP_FILE = w3mhelp-w3m_ja.html --SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/local/ssl/lib -lssl -lcrypto +-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 @@ -25,8 +25,8 @@ -GCTARGET=gc/gc.a RANLIB=ranlib MKDIR=mkdir -p - VERSION=0.1.9 -@@ -89,26 +85,34 @@ + VERSION=0.1.11-pre +@@ -94,26 +90,34 @@ #define JA 0 #define EN 1 @@ -46,23 +46,21 @@ #define MENU #define USE_COOKIE -#define USE_SSL --#define USE_SSL_VERIFY +#undef USE_SSL -+#undef USE_SSL_VERIFY + #undef USE_SSL_VERIFY #undef FTPPASS_HOSTNAMEGEN - + #undef SHOW_PARAMS -#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 "/usr/local/lib/w3m" +-#define HELP_DIR "/usr/local/lib/w3m" +-#define HELP_FILE "w3mhelp.html" +#define LIB_DIR "%%PREFIX%%/libexec/w3m" +#ifdef JAPANESE +#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp-w3m_ja.html" diff --git a/www/w3m/files/patch-ao b/www/w3m/files/patch-ao index 7e2ecdbc46ef..594673af2bdc 100644 --- a/www/w3m/files/patch-ao +++ b/www/w3m/files/patch-ao @@ -1,17 +1,17 @@ ---- rc.c.orig Sat Apr 22 06:47:16 2000 -+++ rc.c Sat Apr 22 06:47:24 2000 -@@ -762,16 +762,3 @@ +--- rc.c.orig Fri Jun 9 04:55:18 2000 ++++ rc.c Fri Jun 9 04:55:26 2000 +@@ -990,16 +990,3 @@ Strcat_charp(file, base); return expandName(file->ptr); } - --char * +-char * -helpFile(char *base) -{ -#ifdef __EMX__ -- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR)); +- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR)); -#else /* not __EMX__ */ -- Str file = Strnew_charp(HELP_DIR); +- Str file = Strnew_charp(HELP_DIR); -#endif /* not __EMX__ */ - Strcat_char(file, '/'); - Strcat_charp(file, base); |