diff options
author | mm <mm@FreeBSD.org> | 2007-07-03 06:34:45 +0800 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2007-07-03 06:34:45 +0800 |
commit | f16491900a911ae7c829ff72f8391be970229f08 (patch) | |
tree | 3becd65c4f62b0d4a1aa17d03cab5f7b57df688f | |
parent | 74f442c9f431932b56a01c919d7e2bf3da274fcb (diff) | |
download | freebsd-ports-gnome-f16491900a911ae7c829ff72f8391be970229f08.tar.gz freebsd-ports-gnome-f16491900a911ae7c829ff72f8391be970229f08.tar.zst freebsd-ports-gnome-f16491900a911ae7c829ff72f8391be970229f08.zip |
- move AOLSERVERBASE under PREFIX
- add MANPAGES option and set to disabled by default
- bump PORTREVISION
Approved by: garga (mentor)
-rw-r--r-- | www/aolserver/Makefile | 31 | ||||
-rw-r--r-- | www/aolserver/pkg-plist | 8 |
2 files changed, 22 insertions, 17 deletions
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile index 69abd4eb2151..faaf20789746 100644 --- a/www/aolserver/Makefile +++ b/www/aolserver/Makefile @@ -7,35 +7,35 @@ PORTNAME= aolserver PORTVERSION= 4.5.0 -PORTREVISION= 4 +DISTVERSIONSUFFIX= -src +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= aolserver DIST_SUBDIR= aolserver -DISTVERSIONSUFFIX= -src MAINTAINER= mm@FreeBSD.org COMMENT= A multithreaded web server with embedded TCL interpreter WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -AOLSERVERBASE?= ${TARGETDIR}/${PORTNAME} +AOLSERVERBASE?= ${PORTNAME} AOLSERVERUSER?= nobody AOLSERVERGROUP?= nogroup -MANPREFIX= ${AOLSERVERBASE} +MANPREFIX= ${TARGETDIR}/${AOLSERVERBASE} USE_GMAKE= yes HAS_CONFIGURE= yes -USE_RC_SUBR= aolserver +USE_RC_SUBR= ${PORTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-message aolserver pkg-install pkg-deinstall SUB_VARS= AOLSERVERUSER=${AOLSERVERUSER} \ AOLSERVERGROUP=${AOLSERVERGROUP} -SUB_LIST+= ${SUB_VARS} AOLSERVERBASE=${AOLSERVERBASE} -PLIST_SUB+= ${SUB_VARS} AOLSERVERBASE=${AOLSERVERBASE:S/${TARGETDIR}\///} +SUB_LIST+= ${SUB_VARS} AOLSERVERBASE="${PREFIX}/${AOLSERVERBASE}" +PLIST_SUB+= ${SUB_VARS} AOLSERVERBASE="${AOLSERVERBASE}" USE_TCL= 84+ USE_TCL_THREADS= yes @@ -43,6 +43,7 @@ USE_TCL_THREADS= yes ONLY_FOR_ARCHS= i386 amd64 OPTIONS= HTMLDOCS "Install HTML documentation" off \ + MANPAGES "Install manpages" off \ TESTS "Install tests in examples directory" off .include <bsd.port.pre.mk> @@ -54,11 +55,11 @@ SUB_LIST+= MKDIR="${MKDIR}" ECHO_CMD="${ECHO_CMD}" \ BROKEN= does not compile on ia64 .endif -CONFIGURE_ENV+= TCLSH=${TCLSH} -CONFIGURE_ARGS+= --prefix=${AOLSERVERBASE} \ - --with-tcl=${TCL_LIBDIR} +CONFIGURE_ENV+= TCLSH="${TCLSH}" +CONFIGURE_ARGS+= --prefix="${PREFIX}/${AOLSERVERBASE}" \ + --with-tcl="${TCL_LIBDIR}" -.if !defined(NO_INSTALL_MANPAGES) +.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_MANPAGES) INSTALL_TARGET= install install-man MANCOMPRESSED= no MAN1= nsd.1 @@ -681,6 +682,9 @@ MLINKS= Ns_AdpRegisterParser.3 Ns_AdpRequest.3 \ ns_share.n nsv_names.n \ ns_share.n nsv_set.n \ ns_share.n nsv_unset.n +PLIST_SUB+= MANPAGES="" +.else +PLIST_SUB+= MANPAGES="@comment " .endif .if !defined(NOPORTDOCS) @@ -717,9 +721,10 @@ post-install: @ ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor .endif - @ ${ECHO_MSG} "Installing sample configuration file" - @ ${SED} -e 's|\[ns_info address\]|0.0.0.0|' ${WRKSRC}/examples/config/base.tcl > ${AOLSERVERBASE}/sample-config.tcl + @ ${SED} -e 's|\[ns_info address\]|0.0.0.0|' \ + ${WRKSRC}/examples/config/base.tcl > \ + ${PREFIX}/${AOLSERVERBASE}/sample-config.tcl # post-install script @ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/www/aolserver/pkg-plist b/www/aolserver/pkg-plist index 3ec740c88f0e..5f09466538c3 100644 --- a/www/aolserver/pkg-plist +++ b/www/aolserver/pkg-plist @@ -816,10 +816,10 @@ %%HTMLDOCS%%@dirrm %%AOLSERVERBASE%%/html @dirrm %%AOLSERVERBASE%%/lib @dirrmtry %%AOLSERVERBASE%%/log -@dirrm %%AOLSERVERBASE%%/man/man1 -@dirrm %%AOLSERVERBASE%%/man/man3 -@dirrm %%AOLSERVERBASE%%/man/mann -@dirrm %%AOLSERVERBASE%%/man +%%MANPAGES%%@dirrm %%AOLSERVERBASE%%/man/man1 +%%MANPAGES%%@dirrm %%AOLSERVERBASE%%/man/man3 +%%MANPAGES%%@dirrm %%AOLSERVERBASE%%/man/mann +%%MANPAGES%%@dirrm %%AOLSERVERBASE%%/man @dirrm %%AOLSERVERBASE%%/modules/tcl/nsperm @dirrm %%AOLSERVERBASE%%/modules/tcl @dirrm %%AOLSERVERBASE%%/modules |