Fri Mar 2 09:58:55 2012 UTC ()
Use ENGINE=MyISAM instead of TYPE=MyISAM in database template, as TYPE is no
longer supported in MySQL 5.5.  Noted by Zhang Huangbin.  Bump PKGREVISION.


(ghen)
diff -r1.5 -r1.6 pkgsrc/mail/policyd/Makefile

cvs diff -r1.5 -r1.6 pkgsrc/mail/policyd/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/policyd/Makefile 2011/11/29 06:19:43 1.5
+++ pkgsrc/mail/policyd/Makefile 2012/03/02 09:58:55 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2011/11/29 06:19:43 sbd Exp $ 1# $NetBSD: Makefile,v 1.6 2012/03/02 09:58:55 ghen Exp $
2 2
3DISTNAME= policyd-1.82 3DISTNAME= policyd-1.82
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=policyd/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=policyd/}
7 7
8MAINTAINER= ghen@NetBSD.org 8MAINTAINER= ghen@NetBSD.org
9HOMEPAGE= http://www.policyd.org/ 9HOMEPAGE= http://www.policyd.org/
10COMMENT= Policy daemon for Postfix with greylisting and throttling 10COMMENT= Policy daemon for Postfix with greylisting and throttling
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17BUILD_TARGET= build 17BUILD_TARGET= build
@@ -22,26 +22,31 @@ BINDIR= ${PREFIX}/libexec/policyd @@ -22,26 +22,31 @@ BINDIR= ${PREFIX}/libexec/policyd
22DOCDIR= ${PREFIX}/share/doc/policyd 22DOCDIR= ${PREFIX}/share/doc/policyd
23EGDIR= ${PREFIX}/share/examples/policyd 23EGDIR= ${PREFIX}/share/examples/policyd
24INSTALLATION_DIRS= ${BINDIR} ${DOCDIR} ${EGDIR} 24INSTALLATION_DIRS= ${BINDIR} ${DOCDIR} ${EGDIR}
25 25
26CONF_FILES= ${EGDIR}/policyd.conf ${PKG_SYSCONFDIR}/policyd.conf 26CONF_FILES= ${EGDIR}/policyd.conf ${PKG_SYSCONFDIR}/policyd.conf
27 27
28RCD_SCRIPTS= policyd 28RCD_SCRIPTS= policyd
29 29
30SUBST_CLASSES+= config 30SUBST_CLASSES+= config
31SUBST_STAGE.config= post-build 31SUBST_STAGE.config= post-build
32SUBST_FILES.config= policyd.conf 32SUBST_FILES.config= policyd.conf
33SUBST_SED.config= -e 's,%%VARBASE%%,${VARBASE},' 33SUBST_SED.config= -e 's,%%VARBASE%%,${VARBASE},'
34 34
 35SUBST_CLASSES+= dbtype
 36SUBST_STAGE.dbtype= post-build
 37SUBST_FILES.dbtype= DATABASE.mysql
 38SUBST_SED.dbtype= -e 's,TYPE=,ENGINE=,'
 39
35FILES_SUBST+= BINDIR=${BINDIR} 40FILES_SUBST+= BINDIR=${BINDIR}
36MESSAGE_SUBST+= BINDIR=${BINDIR} 41MESSAGE_SUBST+= BINDIR=${BINDIR}
37MESSAGE_SUBST+= EGDIR=${EGDIR} 42MESSAGE_SUBST+= EGDIR=${EGDIR}
38 43
39do-install: 44do-install:
40 ${INSTALL_PROGRAM} ${WRKSRC}/policyd ${DESTDIR}${BINDIR} 45 ${INSTALL_PROGRAM} ${WRKSRC}/policyd ${DESTDIR}${BINDIR}
41 ${INSTALL_PROGRAM} ${WRKSRC}/cleanup ${DESTDIR}${BINDIR} 46 ${INSTALL_PROGRAM} ${WRKSRC}/cleanup ${DESTDIR}${BINDIR}
42 ${INSTALL_PROGRAM} ${WRKSRC}/stats ${DESTDIR}${BINDIR} 47 ${INSTALL_PROGRAM} ${WRKSRC}/stats ${DESTDIR}${BINDIR}
43 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} 48 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
44 ${INSTALL_DATA} ${WRKSRC}/policyd.conf ${DESTDIR}${EGDIR} 49 ${INSTALL_DATA} ${WRKSRC}/policyd.conf ${DESTDIR}${EGDIR}
45 ${INSTALL_DATA} ${WRKSRC}/doc/blacklist_helo.sql ${DESTDIR}${EGDIR} 50 ${INSTALL_DATA} ${WRKSRC}/doc/blacklist_helo.sql ${DESTDIR}${EGDIR}
46 ${INSTALL_DATA} ${WRKSRC}/doc/whitelist.sql ${DESTDIR}${EGDIR} 51 ${INSTALL_DATA} ${WRKSRC}/doc/whitelist.sql ${DESTDIR}${EGDIR}
47 ${INSTALL_DATA} ${WRKSRC}/DATABASE.mysql ${DESTDIR}${EGDIR} 52 ${INSTALL_DATA} ${WRKSRC}/DATABASE.mysql ${DESTDIR}${EGDIR}