Import of pkgsrc-2016Q3

databases/sqlrelay/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2015/09/02 12:39:33 fhajny Exp $
+# $NetBSD: Makefile,v 1.48 2016/07/09 06:38:03 wiz Exp $
 
 COMMENT=		Database connection pooling middleware and API
+PKGREVISION=		1
 
 .include "../../databases/sqlrelay/Makefile.common"
 
@@ -16,7 +17,7 @@ CONFIGURE_ARGS+=	--disable-db2 --disable-erlang --disable-firebird	\
 INSTALL_MAKE_FLAGS+=	EXAMPLEDIR=${DESTDIR}${EGDIR}
 
 CONF_FILES+=		${EGDIR}/sqlrelay.conf ${PKG_SYSCONFDIR}/sqlrelay.conf
-CONF_FILES+=		${EGDIR}/sqlrelay.dtd ${PKG_SYSCONFDIR}/sqlrelay.dtd
+CONF_FILES+=		${EGDIR}/sqlrelay.xsd ${PKG_SYSCONFDIR}/sqlrelay.xsd
 
 SQLR_USER?=		sqlrelay
 SQLR_GROUP?=		${SQLR_USER}
@@ -43,6 +44,11 @@ SUBST_SED.user+=	-e '/runasgroup/s/nobody/${SQLR_GROUP}/'
 SUBST_SED.user+=	-e '/RUNASUSER/s/nobody/${SQLR_USER}/'
 SUBST_SED.user+=	-e '/RUNASGROUP/s/nobody/${SQLR_GROUP}/'
 
+OPSYSVARS+=		SOEXT
+SOEXT.Darwin=		bundle
+SOEXT.*=		so
+PLIST_SUBST+=		SOEXT=${SOEXT}
+
 FILES_SUBST+=		SQLR_USER=${SQLR_USER}
 FILES_SUBST+=		SQLR_GROUP=${SQLR_GROUP}
 FILES_SUBST+=		SQLR_DATA=${SQLR_DATA}
@@ -51,11 +57,4 @@ RCD_SCRIPTS+=				sqlrelay sqlrcachemanager
 RCD_SCRIPT_SRC.sqlrelay=		${WRKSRC}/init/rc.sqlrelay
 RCD_SCRIPT_SRC.sqlrcachemanager=	${WRKSRC}/init/rc.sqlrcachemanager
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-_WRAP_EXTRA_ARGS.CXX+=	-Wno-error=unused-private-field -Wno-error=mismatched-tags
-CWRAPPERS_APPEND.cxx+=	-Wno-error=unused-private-field -Wno-error=mismatched-tags
-.endif
-
 .include "../../mk/bsd.pkg.mk"