diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-13 08:07:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-13 08:07:52 +0000 |
| commit | 23bda3ab01fea2c746e86f8bdc5b492c6e3617ea (patch) | |
| tree | 7907af43f000acb70e07e1d86f737a9dfc0b30f7 | |
| parent | 88787a00e6b55830a5452c109f6f515ccceb81ee (diff) | |
| download | pkgsrc-23bda3ab01fea2c746e86f8bdc5b492c6e3617ea.tar.gz | |
Use curses.buildlink3.mk if LYNX_SCREEN_LIB == "curses" instead of
unconditionally including ncurses/buildlink3.mk.
| -rw-r--r-- | www/lynx-current/Makefile | 21 | ||||
| -rw-r--r-- | www/lynx/Makefile | 23 |
2 files changed, 23 insertions, 21 deletions
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 4c2e5fc611b..d35b16110b6 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2004/01/24 15:23:47 grant Exp $ +# $NetBSD: Makefile,v 1.52 2004/02/13 08:07:52 jlam Exp $ # DISTNAME= lynx2.8.5dev.7 @@ -29,6 +29,8 @@ MAKEFILE= makefile BUILD_DEFS+= LYNX_SCREEN_LIB USE_SOCKS USE_INET6 +.include "../../mk/bsd.prefs.mk" + # For nls/gettext CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --with-nls-datadir=${PREFIX}/share @@ -59,19 +61,15 @@ CONFIGURE_ARGS+= --enable-nested-tables CONFIGURE_ARGS+= --enable-prettysrc CONFIGURE_ARGS+= --enable-read-eta -post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx - -.include "../../mk/bsd.prefs.mk" - -.if (${LYNX_SCREEN_LIB} == slang) +.if ${LYNX_SCREEN_LIB} == "slang" . include "../../devel/libslang/buildlink3.mk" -.elif (${LYNX_SCREEN_LIB} == ncurses) +.elif ${LYNX_SCREEN_LIB} == "ncurses" USE_NCURSES= color . include "../../devel/ncurses/buildlink3.mk" CONFIGURE_ARGS+= --enable-color-style -.elif (${LYNX_SCREEN_LIB} == curses) -. if ${MACHINE_PLATFORM:MNetBSD-1.5*-i386} != "" +.elif ${LYNX_SCREEN_LIB} == curses +. include "../../mk/curses.buildlink3.mk" +. if !empty(MACHINE_PLATFORM:MNetBSD-1.5*-i386) CONFIGURE_ARGS+= --enable-color-style . endif .else @@ -111,6 +109,9 @@ CONFIGURE_ARGS+= --with-socks5 CONFIGURE_ARGS+= --enable-ipv6 .endif +post-install: + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/www/lynx/Makefile b/www/lynx/Makefile index b652eaf9acb..d4f4c04d781 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2004/01/20 12:27:59 agc Exp $ +# $NetBSD: Makefile,v 1.65 2004/02/13 08:07:52 jlam Exp $ # DISTNAME= lynx2.8.4rel.1 @@ -70,19 +70,15 @@ CONFIGURE_ARGS+= --enable-justify-elts CONFIGURE_ARGS+= --enable-prettysrc CONFIGURE_ARGS+= --enable-read-eta -pre-install: - ${RM} -f ${WRKSRC}/CHANGES.orig - -post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx - -.if (${LYNX_SCREEN_LIB} == slang) +.if ${LYNX_SCREEN_LIB} == "slang" . include "../../devel/libslang/buildlink3.mk" -.elif (${LYNX_SCREEN_LIB} == ncurses) +.elif ${LYNX_SCREEN_LIB} == "ncurses" USE_NCURSES= color . include "../../devel/ncurses/buildlink3.mk" CONFIGURE_ARGS+= --enable-color-style -.elif (${LYNX_SCREEN_LIB} != curses) +.elif ${LYNX_SCREEN_LIB} == "curses" +. include "../../mk/curses.buildlink3.mk" +.else pre-configure: @${ECHO} '****************************************************' @${ECHO} '* Invalid value for LYNX_SCREEN_LIB. Please choose *' @@ -119,7 +115,12 @@ CONFIGURE_ARGS+= --with-socks5 CONFIGURE_ARGS+= --enable-ipv6 .endif -.include "../../devel/ncurses/buildlink3.mk" +pre-install: + ${RM} -f ${WRKSRC}/CHANGES.orig + +post-install: + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx + .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" |