diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2002-02-03 03:02:27 +0000 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2002-02-03 03:02:27 +0000 |
| commit | 5ce9ff8ff8a37d22d1fc218e348471f17d95e208 (patch) | |
| tree | 929d66356c557ef1dfa50b586d36c061fb378591 /www/w3m | |
| parent | 254d2122f6458c1b1b4b67881b5f5c0d9fac82b0 (diff) | |
| download | FreeBSD-ports-5ce9ff8ff8a37d22d1fc218e348471f17d95e208.zip FreeBSD-ports-5ce9ff8ff8a37d22d1fc218e348471f17d95e208.tar.gz | |
Allow coexistence of M17N and INLINE_IMAGE knob
since w3m-img patch has been merged into the w3m CVS repository
and w3m-0.2.5-m17n-20020202 is based on the source code after the merge.
Now we can use w3m with m17n and inline image support.
Diffstat (limited to 'www/w3m')
| -rw-r--r-- | www/w3m/Makefile | 18 | ||||
| -rw-r--r-- | www/w3m/scripts/pre-configure | 8 |
2 files changed, 16 insertions, 10 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile index bcbe364..36cc21c 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -61,9 +61,6 @@ DISTNAME= ${PORTNAME}-${M17N_BASE_W3M_VERSION}-m17n-${M17N_VERSION} CONFIGURE_ARGS+= --suffix="" PLIST_SUB+= M17N_ONLY="" NO_M17N="@comment " - -# Disable inline image support for w3m-m17n. -.undef INLINE_IMAGE .else PLIST_SUB+= M17N_ONLY="@comment " NO_M17N="" .endif @@ -91,11 +88,12 @@ MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" .endif .if defined(INLINE_IMAGE) +.if !defined(M17N) PORTVERSION:= ${PORTVERSION}+${IMG_VERSION} PATCH_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ PATCHFILES= ${PORTNAME}-${IMG_BASE_W3M_VERSION}+cvs-${IMG_BASE_W3M_CVS_REVISION}-img-${IMG_VERSION}.patch.gz PATCH_DIST_STRIP= -p1 - +.endif USE_IMLIB= yes DOCS+= README.img @@ -110,19 +108,27 @@ PLIST_SUB+= INLINE_IMAGE_ONLY="@comment " PKGMESSAGE= ${NONEXISTENT} .endif +pre-everything:: +.if defined(M17N) + @${ECHO_MSG} "====>" + @${ECHO_MSG} "====> To enable Japanese message and migemo support, define JAPANESE" + @${ECHO_MSG} "====> To enable inline image support, define INLINE_IMAGE" + @${ECHO_MSG} "====>" +.endif + pre-extract: .if !defined(WITHOUT_SSL) @${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL." .endif post-extract: -.if defined(INLINE_IMAGE) +.if defined(INLINE_IMAGE) && !defined(M17N) ${SED} -e "s,w3m/0.2.5,w3m/0.2.4+cvs," < ${WRKSRC}/version.c.in > ${WRKSRC}/version.c.in.tmp ${MV} ${WRKSRC}/version.c.in.tmp ${WRKSRC}/version.c.in .endif post-patch: -.if defined(INLINE_IMAGE) +.if defined(INLINE_IMAGE) && !defined(M17N) ${SED} -e "s,w3m/0.2.4+cvs-img-2.2,w3m/0.2.5-img-2.2," < ${WRKSRC}/version.c.in > ${WRKSRC}/version.c.in.tmp ${MV} ${WRKSRC}/version.c.in.tmp ${WRKSRC}/version.c.in .endif diff --git a/www/w3m/scripts/pre-configure b/www/w3m/scripts/pre-configure index 2904c7f..7c0d7f0 100644 --- a/www/w3m/scripts/pre-configure +++ b/www/w3m/scripts/pre-configure @@ -13,7 +13,7 @@ echo dcc=${CC} >> ${WRKSRC}/config.param echo emacs_like_lineedit=y >> ${WRKSRC}/config.param echo use_bundled_gclib=n >> ${WRKSRC}/config.param -if [ "x${USE_OPENSSL}" = "xyes" ] ; then +if [ -n "${USE_OPENSSL}" ] ; then echo dcflags="\"${SSL_CFLAGS} -I${LOCALBASE}/include\"" >> ${WRKSRC}/config.param echo dldflags="\"${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib\"" >> ${WRKSRC}/config.param else @@ -21,7 +21,7 @@ else echo dldflags=-L${LOCALBASE}/lib >> ${WRKSRC}/config.param fi -if [ "x${JAPANESE}" = "xYes" ] ; then +if [ -n "${JAPANESE}" ] ; then echo lang=JA >> ${WRKSRC}/config.param echo use_migemo=y >> ${WRKSRC}/config.param else @@ -29,11 +29,11 @@ else echo use_migemo=n >> ${WRKSRC}/config.param fi -if [ "x${INLINE_IMAGE}" = "xyes" ] ; then +if [ -n "${INLINE_IMAGE}" ] ; then echo use_image=y >> ${WRKSRC}/config.param fi -if [ "x${M17N}" = "xyes" ] ; then +if [ -n "${M17N}" ] ; then echo charset=UTF-8 >> ${WRKSRC}/config.param else echo display_code=E >> ${WRKSRC}/config.param |
