diff options
author | obrien <obrien@FreeBSD.org> | 2000-08-10 10:26:26 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-08-10 10:26:26 +0000 |
commit | 1dd479041fb16f53a9b89827360e8c1475e1fcf1 (patch) | |
tree | 79526885e13177174f4d5831b8f1ac6dd5249f56 /mail | |
parent | 89e77aab3cc2cac8870ee820f503e3663f13e2a0 (diff) | |
download | FreeBSD-ports-1dd479041fb16f53a9b89827360e8c1475e1fcf1.zip FreeBSD-ports-1dd479041fb16f53a9b89827360e8c1475e1fcf1.tar.gz |
Improve the granularity of the WITH_ options. Rather than use my approved
configuration when BATCH is defined (as a BATCH user might want ncurses)
only do it when package building. Also, add a knob so that the HTML docs
build and intall can be turned on w/o doing a BATCH build.
It would be nice if someone started a mutt-docs port to seperate the PITA
docs building (due to sgmlformat, et al.) from the binary production.
Asked for by: marko
Diffstat (limited to 'mail')
-rw-r--r-- | mail/mutt-devel/Makefile | 31 | ||||
-rw-r--r-- | mail/mutt/Makefile | 31 | ||||
-rw-r--r-- | mail/mutt14/Makefile | 31 |
3 files changed, 51 insertions, 42 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 0ab091d..f330285 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -31,26 +31,29 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -.if defined(BATCH) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang +.if defined(PACKAGE_BUILDING) +WITH_SLANG= yes BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell +RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \ + urlview:${PORTSDIR}/textproc/urlview .if ${MACHINE_ARCH} != "alpha" # coredump in sgmls -BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat +WITH_DOCS= yes +.endif .endif -RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell + +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +.if defined(WITH_SLANG) +LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .elif defined(WITH_NCURSES_PORT) -LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses +LIB_DEPENDS+= ncurses.4:${PORTSDIR}/devel/ncurses CFLAGS+= -I${PREFIX}/include/ncurses -.elif defined(WITH_SLANG) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang .endif .if defined(WITH_SSL) USE_OPENSSL= RSA .endif -.if defined(PACKAGE_BUILDING) -RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview +.if defined(WITH_DOCS) +BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .endif DIST_SUBDIR= mutt @@ -63,7 +66,7 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif -.if defined(BATCH) || defined(WITH_SLANG) +.if defined(WITH_SLANG) CONFIGURE_ARGS+= --with-slang=${PREFIX} .elif defined(WITH_NCURSES_PORT) CONFIGURE_ARGS+= --with-curses=${PREFIX} @@ -88,7 +91,7 @@ post-build: ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \ ed -s ${WRKSRC}/doc/mutt.man -.if defined(BATCH) +.if defined(WITH_DOCS) PLIST:= ${WRKDIR}/PLIST pre-install: @${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST} @@ -103,8 +106,8 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/mutt && ${CHMOD} a+rx ${PREFIX}/share/doc/mutt @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ ${PREFIX}/share/doc/mutt -.if defined(BATCH) - ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html +.if defined(WITH_DOCS) + env MANMODE=0755 ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt .endif diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 0ab091d..f330285 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -31,26 +31,29 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -.if defined(BATCH) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang +.if defined(PACKAGE_BUILDING) +WITH_SLANG= yes BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell +RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \ + urlview:${PORTSDIR}/textproc/urlview .if ${MACHINE_ARCH} != "alpha" # coredump in sgmls -BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat +WITH_DOCS= yes +.endif .endif -RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell + +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +.if defined(WITH_SLANG) +LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .elif defined(WITH_NCURSES_PORT) -LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses +LIB_DEPENDS+= ncurses.4:${PORTSDIR}/devel/ncurses CFLAGS+= -I${PREFIX}/include/ncurses -.elif defined(WITH_SLANG) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang .endif .if defined(WITH_SSL) USE_OPENSSL= RSA .endif -.if defined(PACKAGE_BUILDING) -RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview +.if defined(WITH_DOCS) +BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .endif DIST_SUBDIR= mutt @@ -63,7 +66,7 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif -.if defined(BATCH) || defined(WITH_SLANG) +.if defined(WITH_SLANG) CONFIGURE_ARGS+= --with-slang=${PREFIX} .elif defined(WITH_NCURSES_PORT) CONFIGURE_ARGS+= --with-curses=${PREFIX} @@ -88,7 +91,7 @@ post-build: ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \ ed -s ${WRKSRC}/doc/mutt.man -.if defined(BATCH) +.if defined(WITH_DOCS) PLIST:= ${WRKDIR}/PLIST pre-install: @${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST} @@ -103,8 +106,8 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/mutt && ${CHMOD} a+rx ${PREFIX}/share/doc/mutt @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ ${PREFIX}/share/doc/mutt -.if defined(BATCH) - ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html +.if defined(WITH_DOCS) + env MANMODE=0755 ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt .endif diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index 0ab091d..f330285 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -31,26 +31,29 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext -.if defined(BATCH) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang +.if defined(PACKAGE_BUILDING) +WITH_SLANG= yes BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell +RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \ + urlview:${PORTSDIR}/textproc/urlview .if ${MACHINE_ARCH} != "alpha" # coredump in sgmls -BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat +WITH_DOCS= yes +.endif .endif -RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell + +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext +.if defined(WITH_SLANG) +LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .elif defined(WITH_NCURSES_PORT) -LIB_DEPENDS= ncurses.4:${PORTSDIR}/devel/ncurses +LIB_DEPENDS+= ncurses.4:${PORTSDIR}/devel/ncurses CFLAGS+= -I${PREFIX}/include/ncurses -.elif defined(WITH_SLANG) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang .endif .if defined(WITH_SSL) USE_OPENSSL= RSA .endif -.if defined(PACKAGE_BUILDING) -RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview +.if defined(WITH_DOCS) +BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .endif DIST_SUBDIR= mutt @@ -63,7 +66,7 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif -.if defined(BATCH) || defined(WITH_SLANG) +.if defined(WITH_SLANG) CONFIGURE_ARGS+= --with-slang=${PREFIX} .elif defined(WITH_NCURSES_PORT) CONFIGURE_ARGS+= --with-curses=${PREFIX} @@ -88,7 +91,7 @@ post-build: ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \ ed -s ${WRKSRC}/doc/mutt.man -.if defined(BATCH) +.if defined(WITH_DOCS) PLIST:= ${WRKDIR}/PLIST pre-install: @${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST} @@ -103,8 +106,8 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/mutt && ${CHMOD} a+rx ${PREFIX}/share/doc/mutt @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ ${PREFIX}/share/doc/mutt -.if defined(BATCH) - ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html +.if defined(WITH_DOCS) + env MANMODE=0755 ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html ${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt .endif |