diff options
| author | jlam <jlam> | 2004-02-22 18:34:54 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-22 18:34:54 +0000 |
| commit | 175a9d26a9c8bf476a7ebcf6174c21940c3307d2 (patch) | |
| tree | c4101c588c99e9b3a3f32db61d256870e4f8063e /www/thttpd | |
| parent | fe9e4da418c307f5e4dbe7cd5425c3ca18408329 (diff) | |
| download | pkgsrc-175a9d26a9c8bf476a7ebcf6174c21940c3307d2.tar.gz | |
bl3ify and general touch-up
Diffstat (limited to 'www/thttpd')
| -rw-r--r-- | www/thttpd/Makefile | 17 | ||||
| -rw-r--r-- | www/thttpd/files/thttpd.sh | 8 |
2 files changed, 12 insertions, 13 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 1db58fbe2f6..1202a8fcb39 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/01/17 12:55:05 xtraeme Exp $ +# $NetBSD: Makefile,v 1.27 2004/02/22 18:34:54 jlam Exp $ DISTNAME= thttpd-2.25b CATEGORIES= www @@ -11,16 +11,20 @@ HOMEPAGE= http://www.acme.com/software/thttpd/ COMMENT= Tiny/turbo/throttling HTTP server EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -GNU_CONFIGURE= # defined + +USE_BUILDLINK3= yes +GNU_CONFIGURE= yes +USE_PKGINSTALL= yes # Note: this pkg auto-detects IPv6 without regarding USE_INET6. BUILD_DEFS+= USE_INET6 -USE_PKGINSTALL= yes EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf RCD_SCRIPTS= thttpd +INSTALLATION_DIRS= share/thttpd + pre-configure: ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1 ${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thtpasswd.c @@ -31,14 +35,11 @@ pre-configure: done post-build: - for FILE in thttpd.conf; do \ - ${SED} ${FILES_SUBST_SED} \ + @for FILE in thttpd.conf; do \ + ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/$${FILE} > ${WRKDIR}/$${FILE}; \ done -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/thttpd - post-install: ${INSTALL_DATA} ${WRKDIR}/thttpd.conf ${PREFIX}/share/examples ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh index f4ec02c8991..16d042b4cbd 100644 --- a/www/thttpd/files/thttpd.sh +++ b/www/thttpd/files/thttpd.sh @@ -1,12 +1,11 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: thttpd.sh,v 1.9 2002/09/20 02:02:02 grant Exp $ +# $NetBSD: thttpd.sh,v 1.10 2004/02/22 18:34:54 jlam Exp $ # # PROVIDE: thttpd # REQUIRE: DAEMON -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi @@ -16,8 +15,7 @@ command="@PREFIX@/sbin/${name}" command_args="-C @PKG_SYSCONFDIR@/${name}.conf" required_files="@PKG_SYSCONFDIR@/${name}.conf" -if [ -f /etc/rc.subr ] -then +if [ -f /etc/rc.subr ]; then load_rc_config $name run_rc_command "$1" else |