diff options
author | fhajny <fhajny> | 2015-05-21 15:11:57 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2015-05-21 15:11:57 +0000 |
commit | 8e56b2a124f1f834e24c0a168ab28fca4af0b3a6 (patch) | |
tree | b57312c3a2b52a1a3f20bf530a14d7ceef8fd00c /databases | |
parent | a607d192db42c6773ce00494c9bb3166dd49adc8 (diff) | |
download | pkgsrc-8e56b2a124f1f834e24c0a168ab28fca4af0b3a6.tar.gz |
Fix some issues raised by the previous update
- Never force install the init script, this is done by pkgsrc automatically
- Pre-create ${PKG_SYSCONFDIR}/sqlrelay.conf.d that was added in 0.48
- Doesn't really need libiconv directly
- Improve SMF manifest
- Remove some unneeded definitions.
Bump PKGREVISION.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/sqlrelay/Makefile | 9 | ||||
-rw-r--r-- | databases/sqlrelay/Makefile.common | 4 | ||||
-rw-r--r-- | databases/sqlrelay/PLIST | 3 | ||||
-rw-r--r-- | databases/sqlrelay/files/smf/manifest.xml | 11 |
4 files changed, 12 insertions, 15 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 340bf5e878f..c4f5d28323d 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/05/20 13:26:45 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2015/05/21 15:11:57 fhajny Exp $ COMMENT= Database connection pooling middleware and API @@ -13,13 +13,10 @@ CONFIGURE_ARGS+= --disable-db2 --disable-erlang --disable-firebird \ --disable-python --disable-ruby --disable-sqlite \ --disable-sybase --disable-tcl -PKG_SYSCONFSUBDIR= sqlrelay -EGDIR= ${PREFIX}/share/examples/sqlrelay 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 ${PKG_SYSCONFDIR}/sqlrelay SQLR_USER?= sqlrelay SQLR_GROUP?= ${SQLR_USER} @@ -35,6 +32,7 @@ OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp ${SQLR_USER} ${SQLR_GROUP} 0775 OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp/ipc ${SQLR_USER} ${SQLR_GROUP} 0775 OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp/pids ${SQLR_USER} ${SQLR_GROUP} 0775 OWN_DIRS_PERMS+= ${SQLR_DATA}/tmp/sockets ${SQLR_USER} ${SQLR_GROUP} 0775 +MAKE_DIRS+= ${PKG_SYSCONFDIR}/sqlrelay.conf.d SUBST_CLASSES+= user SUBST_STAGE.user= pre-configure @@ -60,7 +58,4 @@ _WRAP_EXTRA_ARGS.CXX+= -Wno-error=unused-private-field -Wno-error=mismatched-tag CWRAPPERS_APPEND.cxx+= -Wno-error=unused-private-field -Wno-error=mismatched-tags .endif -post-install: - ${INSTALL_DATA} ${WRKSRC}/init/rc.sqlrelay ${DESTDIR}${EGDIR}/sqlrelay - .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index e448324d74a..1cebb6d3083 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2015/05/20 13:26:45 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.8 2015/05/21 15:11:57 fhajny Exp $ # used by databases/p5-sqlrelay/Makefile # used by databases/php-sqlrelay/Makefile # used by databases/py-sqlrelay/Makefile @@ -11,6 +11,7 @@ # used by databases/sqlrelay/Makefile DISTNAME= sqlrelay-0.59 +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlrelay/} @@ -44,7 +45,6 @@ _WRAP_EXTRA_ARGS.CXX+= -Wno-error=overloaded-virtual CWRAPPERS_APPEND.cxx+= -Wno-error=overloaded-virtual .endif -.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../devel/rudiments/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST index 43590653734..69a27720521 100644 --- a/databases/sqlrelay/PLIST +++ b/databases/sqlrelay/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2015/05/20 13:26:45 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.13 2015/05/21 15:11:57 fhajny Exp $ bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export @@ -630,7 +630,6 @@ share/doc/sqlrelay/programming/ruby.html share/doc/sqlrelay/programming/tcl.html share/examples/sqlrelay/sample-mssqlserver-mysql-errors.map share/examples/sqlrelay/sample-oracle-mysql-errors.map -share/examples/sqlrelay/sqlrelay share/examples/sqlrelay/sqlrelay.conf share/examples/sqlrelay/sqlrelay.conf.example share/examples/sqlrelay/sqlrelay.dtd diff --git a/databases/sqlrelay/files/smf/manifest.xml b/databases/sqlrelay/files/smf/manifest.xml index 1f95aefc06e..0d6ee7141bd 100644 --- a/databases/sqlrelay/files/smf/manifest.xml +++ b/databases/sqlrelay/files/smf/manifest.xml @@ -20,10 +20,13 @@ <propval name="duration" type="astring" value="contract" /> <propval name="ignore_error" type="astring" value="core,signal" /> </property_group> - <instance name="default" enabled="false"> - <dependency name="cachemanager" grouping="require_all" restart_on="error" type="service"> - <service_fmri value="svc:/pkgsrc/sqlrelay:cachemanager" /> - </dependency> + <!-- + Instances should correspond to connections defined in @PKG_SYSCONFDIR@/sqlrelay.conf. + For each connection you add there, create a new instance using svccfg, e.g. + + svccfg -s sqlrelay add mypgserver + --> + <instance name="example" enabled="false"> </instance> <instance name="cachemanager" enabled="false"> <exec_method type="method" name="start" exec="@PREFIX@/bin/sqlr-cachemanager" timeout_seconds="3600" /> |