[pkgsrc/trunk]: pkgsrc/www/bozohttpd * Use Makefile.boot instead of Makefile ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/304a941a2175
branches:  trunk
changeset: 533082:304a941a2175
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 08 01:44:51 2007 +0000

description:
* Use Makefile.boot instead of Makefile so that we don't need BSD make
  to build bozohttpd.

* Use a custom do-install target to install the binary and the manpage.

* Replace the pre-build target with a subst framework class.

Bump the PKGREVISION to 1 now that we no longer build or install the
catman page.

diffstat:

 www/bozohttpd/Makefile         |  27 +++++++++++++--------------
 www/bozohttpd/PLIST            |   3 +--
 www/bozohttpd/distinfo         |   3 ++-
 www/bozohttpd/patches/patch-ab |  21 +++++++++++++++++++++
 4 files changed, 37 insertions(+), 17 deletions(-)

diffs (98 lines):

diff -r 22d5a304661b -r 304a941a2175 www/bozohttpd/Makefile
--- a/www/bozohttpd/Makefile    Fri Sep 07 23:28:23 2007 +0000
+++ b/www/bozohttpd/Makefile    Sat Sep 08 01:44:51 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2007/09/07 22:12:24 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2007/09/08 01:44:51 jlam Exp $
 #
 
 DISTNAME=      bozohttpd-20060517
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,8 +13,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-MAKE_ENV+=     BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
-MAKE_ENV+=     MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
+MAKE_FILE=             Makefile.boot
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bozohttpd
 PKG_SUPPORTED_OPTIONS= bozohttpd-do-htpasswd inet6
@@ -28,18 +28,17 @@
 CPPFLAGS+=     -DINET6
 .endif
 
-CPPFLAGS+=     -Wno-error
-MAKE_ENV+=     BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/${PKGMANDIR}
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   Fixing paths in manual page.
+SUBST_STAGE.paths=     pre-build
+SUBST_FILES.paths=     bozohttpd.8
+SUBST_SED.paths=       -e "s|/usr/pkg/|"${PREFIX:Q}"/|g"
 
-INSTALLATION_DIRS=     libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
+INSTALLATION_DIRS=     libexec ${PKGMANDIR}/man8
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/bozohttpd ${PREFIX}/libexec
+       ${INSTALL_MAN} ${WRKSRC}/bozohttpd.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../security/openssl/buildlink3.mk"
-
-pre-build:
-       cd ${WRKSRC}; for file in bozohttpd.8; do                       \
-               ${SED}  -e "s|/usr/pkg/|${PREFIX}/|g"                   \
-                       $${file} >> $${file}.fixed;                     \
-               ${MV} -f $${file}.fixed $${file};                       \
-       done
-
 .include "../../mk/bsd.pkg.mk"
diff -r 22d5a304661b -r 304a941a2175 www/bozohttpd/PLIST
--- a/www/bozohttpd/PLIST       Fri Sep 07 23:28:23 2007 +0000
+++ b/www/bozohttpd/PLIST       Sat Sep 08 01:44:51 2007 +0000
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:23 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/09/08 01:44:51 jlam Exp $
 libexec/bozohttpd
-man/cat8/bozohttpd.0
 man/man8/bozohttpd.8
diff -r 22d5a304661b -r 304a941a2175 www/bozohttpd/distinfo
--- a/www/bozohttpd/distinfo    Fri Sep 07 23:28:23 2007 +0000
+++ b/www/bozohttpd/distinfo    Sat Sep 08 01:44:51 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.42 2007/09/07 23:01:59 jlam Exp $
+$NetBSD: distinfo,v 1.43 2007/09/08 01:44:52 jlam Exp $
 
 SHA1 (bozohttpd-20060517.tar.bz2) = 45ed3c268fffc884db93ebc975121b7c79060fa8
 RMD160 (bozohttpd-20060517.tar.bz2) = edf15fe2998ca2fae0035f8380639e8741d0406a
 Size (bozohttpd-20060517.tar.bz2) = 33032 bytes
 SHA1 (patch-aa) = f1934786cb309cee8ec1c77e0760ee1e79b90f8f
+SHA1 (patch-ab) = 010c130d315975d8a5ffcc3995bd951f6ecb619a
diff -r 22d5a304661b -r 304a941a2175 www/bozohttpd/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/bozohttpd/patches/patch-ab    Sat Sep 08 01:44:51 2007 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.17 2007/09/08 01:44:52 jlam Exp $
+
+--- Makefile.boot.orig Tue Sep 27 20:09:20 2005
++++ Makefile.boot
+@@ -4,7 +4,6 @@
+ # see Makefile for a list of compile options that may be placed in CFLAGS.
+ 
+ CC=   cc
+-CFLAGS=       -O
+ 
+ GROFF=        groff -Tascii
+ CRYPTOLIBDIR= # -L/usr/local/lib
+@@ -14,7 +13,7 @@ FILES=       bozohttpd.c auth-bozo.c cgi-bozo.
+       dir-index-bozo.c ssl-bozo.c tilde-luzah-bozo.c
+ 
+ all:
+-      $(CC) $(CFLAGS) -o bozohttpd $(FILES) $(CRYPTOLIBS)
++      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o bozohttpd $(FILES) $(CRYPTOLIBS)
+ 
+ man:
+       $(GROFF) -mandoc bozohttpd.8 > bozohttpd.cat8