Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/www/bins/Makefile	2003/12/07 15:17:08	1.22
+++ pkgsrc/www/bins/Makefile	2005/01/03 14:03:55	1.28
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.22 2003/12/07 15:17:08 martti Exp $
+# $NetBSD: Makefile,v 1.28 2005/01/03 14:03:55 wiz Exp $
 #
 
-DISTNAME=	bins-1.1.24
+DISTNAME=	bins-1.1.26
 CATEGORIES=	www graphics
-MASTER_SITES=	http://jsautret.free.fr/BINS/
+MASTER_SITES=	http://zubro.chez.tiscali.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	dmcmahill@NetBSD.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://bins.sautret.org/
 COMMENT=	Static HTML photo album generator
 
@@ -18,14 +18,14 @@ DEPENDS+=	p5-Image-Size>=2.980:../../gra
 DEPENDS+=	p5-IO-String>=1.01:../../devel/p5-IO-String
 DEPENDS+=	p5-PerlMagick>=5.3.9nb1:../../graphics/p5-PerlMagick
 DEPENDS+=	p5-XML-Grove>=0.46.0.1:../../textproc/p5-XML-Grove
-DEPENDS+=	p5-XML-Handler-YAWriter-0.23:../../textproc/p5-XML-YAWriter
+DEPENDS+=	p5-XML-Handler>=YAWriter-0.23:../../textproc/p5-XML-YAWriter
 DEPENDS+=	p5-XML-Parser>=2.30:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-HTML-Clean>=0.8:../../www/p5-HTML-Clean
 DEPENDS+=	p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTML-Template>=2.5:../../www/p5-HTML-Template
 DEPENDS+=	p5-URI>=1.19:../../www/p5-URI
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 # bins-edit-gui not installed because many needed packages are missing
 # bins_txt2xml not installed because it's an upgrade tool, and we didn't
@@ -54,7 +54,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/binsrc ${PREFIX}/share/examples/bins/
 	# template: default
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.default
-	${INSTALL_DATA} ${WRKSRC}/templates/*.html			\
+	${INSTALL_DATA} ${WRKSRC}/templates.default/*.html		\
 		${PREFIX}/share/examples/bins/templates.default/
 	# template: jab
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.jab
@@ -71,10 +71,32 @@ do-install:
 		${WRKSRC}/templates.joi/static/*.png			\
 		${WRKSRC}/templates.joi/static/*.js			\
 		${PREFIX}/share/examples/bins/templates.joi/static/
+	# template: marc
+	${INSTALL_DATA_DIR}						\
+		${PREFIX}/share/examples/bins/templates.marc		\
+		${PREFIX}/share/examples/bins/templates.marc/static
+	${INSTALL_DATA} ${WRKSRC}/templates.marc/*.html			\
+		${PREFIX}/share/examples/bins/templates.marc/
+	${INSTALL_DATA}							\
+		${WRKSRC}/templates.marc/static/*.css			\
+		${WRKSRC}/templates.marc/static/*.png			\
+		${WRKSRC}/templates.marc/static/*.js			\
+		${PREFIX}/share/examples/bins/templates.marc/static/
 	# template: new
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bins/templates.new
 	${INSTALL_DATA} ${WRKSRC}/templates.new/*.html			\
 		${PREFIX}/share/examples/bins/templates.new/
+	# template: petrus
+	${INSTALL_DATA_DIR}						\
+		${PREFIX}/share/examples/bins/templates.petrus		\
+		${PREFIX}/share/examples/bins/templates.petrus/static
+	${INSTALL_DATA} ${WRKSRC}/templates.petrus/*.html		\
+		${PREFIX}/share/examples/bins/templates.petrus/
+	${INSTALL_DATA}							\
+		${WRKSRC}/templates.petrus/static/*.css			\
+		${WRKSRC}/templates.petrus/static/*.png			\
+		${WRKSRC}/templates.petrus/static/*.js			\
+		${PREFIX}/share/examples/bins/templates.petrus/static/
 	# template: satyap
 	${INSTALL_DATA_DIR}						\
 		${PREFIX}/share/examples/bins/templates.satyap		\
@@ -90,5 +112,5 @@ do-install:
 		${PREFIX}/${PKGLOCALEDIR}/locale/$$lang/LC_MESSAGES/bins.mo; \
 	done
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"