Fixed PKGMANDIR.

4 files changed, 25 insertions, 22 deletions

diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile
index a574a153ca4..ccb83305771 100644
--- a/textproc/html2text/Makefile
+++ b/textproc/html2text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:03 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/11/12 01:45:19 rillig Exp $
 
 DISTNAME=	html2text-1.3.2a
 CATEGORIES=	textproc
@@ -13,14 +13,14 @@ GCC_REQD+=		3.0
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		ECHO=${ECHO:Q}
 USE_TOOLS+=		gunzip
-INSTALLATION_DIRS=	bin man/man1 man/man5
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 post-build:
 	${GUNZIP_CMD} -d ${WRKSRC}/html2text.1.gz ${WRKSRC}/html2textrc.5.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/html2text ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${PREFIX}/man/man5/html2textrc.5
+	${INSTALL_MAN} ${WRKSRC}/html2text.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${PREFIX}/${PKGMANDIR}/man5/html2textrc.5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile
index d657987d829..723fe60f731 100644
--- a/www/cgilib/Makefile
+++ b/www/cgilib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/14 08:24:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/11/12 01:51:52 rillig Exp $
 #
 
 DISTNAME=	cgilib-0.5
@@ -11,5 +11,6 @@ HOMEPAGE=	http://www.infodrom.org/projects/cgilib/
 COMMENT=	Common gateway interface library
 
 USE_LIBTOOL=	yes
+MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cgilib/distinfo b/www/cgilib/distinfo
index 212878fd5a0..9c07a7734f0 100644
--- a/www/cgilib/distinfo
+++ b/www/cgilib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/03/14 20:41:19 tv Exp $
+$NetBSD: distinfo,v 1.11 2006/11/12 01:51:52 rillig Exp $
 
 SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df
 RMD160 (cgilib-0.5.tar.gz) = 0188fc57aee277e772e32328b96aa836557c0c63
 Size (cgilib-0.5.tar.gz) = 13991 bytes
 SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef
-SHA1 (patch-ab) = dcbf7b2a1253edfae1632c926d9388e79039a6ca
+SHA1 (patch-ab) = 6b19c14f162f27171d3edc631baae610090c1baa
 SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728
 SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d
diff --git a/www/cgilib/patches/patch-ab b/www/cgilib/patches/patch-ab
index 9074fb9c63b..806f428f3e6 100644
--- a/www/cgilib/patches/patch-ab
+++ b/www/cgilib/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.8 2005/03/14 20:41:19 tv Exp $
+$NetBSD: patch-ab,v 1.9 2006/11/12 01:51:52 rillig Exp $
 
---- Makefile.orig	1999-08-20 17:14:07.000000000 -0400
-+++ Makefile
-@@ -14,25 +14,29 @@
+--- Makefile.orig	1999-08-20 23:14:07.000000000 +0200
++++ Makefile	2006-11-12 02:49:34.000000000 +0100
+@@ -14,25 +14,31 @@
  #   along with this program; if not, write to the Free Software
  #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
  
 -CFLAGS = -I. -Wall -O2 -g
++MANDIR?=	${PREFIX}/man
++
 +CFLAGS += -I. -Wall -O2
  LDFLAGS = -L.
 -LIBS = -lcgi
@@ -17,33 +19,33 @@ $NetBSD: patch-ab,v 1.8 2005/03/14 20:41:19 tv Exp $
 -libcgi.a: $(OBJS)
 -	ar rc $@ $^
 +all: libcgi.la cgitest jumpto
- 
--cgitest: cgitest.o libcgi.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
++
 +.SUFFIXES:	.lo
  
--jumpto: jumpto.o libcgi.a
+-cgitest: cgitest.o libcgi.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 +.c.lo:
 +	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -o $@ -c $<
  
--all: libcgi.a cgitest jumpto
+-jumpto: jumpto.o libcgi.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 +libcgi.la: $(OBJS:.o=.lo)
 +	${LIBTOOL} --mode=link ${CC} -o $@ ${OBJS:.o=.lo} \
 +		-rpath ${PREFIX}/lib \
 +		-version-info 0:0
  
--install: cgitest
--	install -m 755 cgitest /usr/lib/cgi-bin
+-all: libcgi.a cgitest jumpto
 +cgitest: cgitest.lo libcgi.la
 +	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ cgitest.lo $(LIBS)
-+
+ 
+-install: cgitest
+-	install -m 755 cgitest /usr/lib/cgi-bin
 +jumpto: jumpto.lo libcgi.la
 +	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ jumpto.lo $(LIBS)
  
  clean:
  	rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html
-@@ -41,3 +45,19 @@ htmlman:
+@@ -41,3 +47,19 @@ htmlman:
  	for f in *.[35]; do \
  	  man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \
  	done
@@ -58,8 +60,8 @@ $NetBSD: patch-ab,v 1.8 2005/03/14 20:41:19 tv Exp $
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${PREFIX}/libexec/cgi-bin
 +	${BSD_INSTALL_DATA} cgi.h ${PREFIX}/include
 +	for i in *.3; do \
-+          ${BSD_INSTALL_MAN} $$i ${PREFIX}/man/man3/; \
++          ${BSD_INSTALL_MAN} $$i ${MANDIR}/man3/; \
 +        done
 +	for i in *.5; do \
-+          ${BSD_INSTALL_MAN} $$i ${PREFIX}/man/man5/; \
++          ${BSD_INSTALL_MAN} $$i ${MANDIR}/man5/; \
 +        done