diff options
| -rw-r--r-- | databases/sqlrelay/Makefile.common | 2 | ||||
| -rw-r--r-- | databases/sqlrelay/distinfo | 6 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-etc_Makefile | 13 | ||||
| -rw-r--r-- | databases/sqlrelay/pkg-plist | 56 | ||||
| -rw-r--r-- | devel/rudiments/Makefile | 4 | ||||
| -rw-r--r-- | devel/rudiments/distinfo | 6 | ||||
| -rw-r--r-- | devel/rudiments/files/patch-configure | 28 | ||||
| -rw-r--r-- | devel/rudiments/pkg-plist | 2 |
8 files changed, 57 insertions, 60 deletions
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index 5c26c9b11671..c6ea84bf4355 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 1.0.0 +SQLRELAY_PORTVERSION= 1.0.1 SQLRELAY_PORTDIR= databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${PORTSDIR}/${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index bae89620dfce..4fac2798fd9a 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484807374 -SHA256 (sqlrelay-1.0.0.tar.gz) = a62e1479f428381b8f8e3ed34c8b4d3223fbe86aff1ef29f305b53c482f50f8b -SIZE (sqlrelay-1.0.0.tar.gz) = 4194484 +TIMESTAMP = 1490519903 +SHA256 (sqlrelay-1.0.1.tar.gz) = 280ba94f6163a3a3575dfd3d971be98050609d9900336d2a18c72a47d1f76817 +SIZE (sqlrelay-1.0.1.tar.gz) = 4368060 diff --git a/databases/sqlrelay/files/patch-etc_Makefile b/databases/sqlrelay/files/patch-etc_Makefile index 97b0525ba692..d816ee4de7ef 100644 --- a/databases/sqlrelay/files/patch-etc_Makefile +++ b/databases/sqlrelay/files/patch-etc_Makefile @@ -1,19 +1,20 @@ --- etc/Makefile.orig 2016-01-28 19:28:21 UTC +++ etc/Makefile -@@ -3,11 +3,13 @@ top_builddir = .. +@@ -3,12 +3,13 @@ top_builddir = .. include ../config.mk install: - $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY).conf.d - $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd +- $(CHMOD) 644 $(sysconfdir)/$(SQLRELAY).xsd - $(MKINSTALLDIRS) $(EXAMPLEDIR) - $(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf - $(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf -+ $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay -+ $(CP) sqlrelay.conf $(sysconfdir)//sqlrelay/conf.sample -+ $(CHMOD) 644 $(sysconfdir)/sqlrelay/conf.sample -+ $(CP) sqlrelay.xsd $(sysconfdir)/sqlrelay/ -+ $(CHMOD) 644 $(sysconfdir)/sqlrelay/sqlrelay.xsd ++ $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY) ++ $(CP) sqlrelay.conf $(sysconfdir)/$(SQLRELAY)/conf.sample ++ $(CHMOD) 644 $(sysconfdir)/$(SQLRELAY)/conf.sample ++ $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY)/ ++ $(CHMOD) 644 $(sysconfdir)/$(SQLRELAY)/sqlrelay.xsd + $(CP) sqlrelay.conf $(EXAMPLEDIR)/sqlrelay.conf + $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist index afe48ecee0a5..0301009a7a45 100644 --- a/databases/sqlrelay/pkg-plist +++ b/databases/sqlrelay/pkg-plist @@ -64,43 +64,43 @@ include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrserver.h include/sqlrelay/sqlrutil.h -lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay.so.4 -lib/libmysql3sqlrelay.so.4.0.0 -lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay.so.4 -lib/libmysql40sqlrelay.so.4.0.0 -lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay.so.4 -lib/libmysql41sqlrelay.so.4.0.0 -lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay.so.4 -lib/libmysql50sqlrelay.so.4.0.0 -lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay.so.4 -lib/libmysql51sqlrelay.so.4.0.0 -lib/libpqsqlrelay.so +%%MYSQL%%lib/libmysql3sqlrelay.so +%%MYSQL%%lib/libmysql3sqlrelay.so.4 +%%MYSQL%%lib/libmysql3sqlrelay.so.4.0.1 +%%MYSQL%%lib/libmysql40sqlrelay.so +%%MYSQL%%lib/libmysql40sqlrelay.so.4 +%%MYSQL%%lib/libmysql40sqlrelay.so.4.0.1 +%%MYSQL%%lib/libmysql41sqlrelay.so +%%MYSQL%%lib/libmysql41sqlrelay.so.4 +%%MYSQL%%lib/libmysql41sqlrelay.so.4.0.1 +%%MYSQL%%lib/libmysql50sqlrelay.so +%%MYSQL%%lib/libmysql50sqlrelay.so.4 +%%MYSQL%%lib/libmysql50sqlrelay.so.4.0.1 +%%MYSQL%%lib/libmysql51sqlrelay.so +%%MYSQL%%lib/libmysql51sqlrelay.so.4 +%%MYSQL%%lib/libmysql51sqlrelay.so.4.0.1 +%%PGSQL%%lib/libpqsqlrelay.so lib/libpqsqlrelay.so.4 -lib/libpqsqlrelay.so.4.0.0 +lib/libpqsqlrelay.so.4.0.1 lib/libsqlrclient.a lib/libsqlrclient.so lib/libsqlrclient.so.4 -lib/libsqlrclient.so.4.0.0 +lib/libsqlrclient.so.4.0.1 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so lib/libsqlrclientwrapper.so.4 -lib/libsqlrclientwrapper.so.4.0.0 +lib/libsqlrclientwrapper.so.4.0.1 %%ODBC%%lib/libsqlrodbc.so %%ODBC%%lib/libsqlrodbc.so.4 -%%ODBC%%lib/libsqlrodbc.so.4.0.0 +%%ODBC%%lib/libsqlrodbc.so.4.0.1 lib/libsqlrserver.a lib/libsqlrserver.so lib/libsqlrserver.so.4 -lib/libsqlrserver.so.4.0.0 +lib/libsqlrserver.so.4.0.1 lib/libsqlrutil.a lib/libsqlrutil.so lib/libsqlrutil.so.4 -lib/libsqlrutil.so.4.0.0 +lib/libsqlrutil.so.4.0.1 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc libexec/sqlrelay/sqlrauth_database.so @@ -152,11 +152,7 @@ man/man8/sqlr-stop.8.gz %%DATADIR%%/examples/sample-mssqlserver-mysql-errors.map %%DATADIR%%/examples/sample-oracle-mysql-errors.map @dir %%ETCDIR%% -@dir /var/sqlrelay/tmp/sockets -@dir /var/sqlrelay/tmp/pids -@dir /var/sqlrelay/tmp/ipc -@dir /var/sqlrelay/tmp -@dir /var/sqlrelay/log -@dir /var/sqlrelay/debug -@dir /var/sqlrelay/cache -@dir /var/sqlrelay +@dir /var/cache/sqlrelay +@dir /var/log/sqlrelay/debug +@dir /var/log/sqlrelay +@dir /var/run/sqlrelay diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index 0fa9248d6f46..2ddb149495da 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rudiments -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.4 CATEGORIES= devel MASTER_SITES= SF @@ -34,6 +34,6 @@ SSL_CONFIGURE_ON= --with-ssl-includes=-I${OPENSSLINC} \ --with-ssl-libs=-L${OPENSSLLIB} post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.4.0.2 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librudiments.so.4.0.4 .include <bsd.port.mk> diff --git a/devel/rudiments/distinfo b/devel/rudiments/distinfo index a3c52f735e43..4106164d4039 100644 --- a/devel/rudiments/distinfo +++ b/devel/rudiments/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484806695 -SHA256 (rudiments-1.0.2.tar.gz) = 3303cb070991d565350fd835ed6eb27b5b12ede88a981bcb3d8d15cc46a4b351 -SIZE (rudiments-1.0.2.tar.gz) = 2226447 +TIMESTAMP = 1490216850 +SHA256 (rudiments-1.0.4.tar.gz) = d40936cbcd71222ddb1599a71ae880a25dfd995e1555575b0a8a91b3f4286cc6 +SIZE (rudiments-1.0.4.tar.gz) = 2216053 diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure index 9c2b9efbdba6..80263ec3a7b9 100644 --- a/devel/rudiments/files/patch-configure +++ b/devel/rudiments/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2016-12-26 04:11:00 UTC -+++ configure -@@ -9595,7 +9595,7 @@ $as_echo_n "checking whether the $compil +--- configure.orig 2017-03-26 09:14:47.000000000 +0000 ++++ configure 2017-03-26 09:14:47.000000000 +0000 +@@ -9622,7 +9622,7 @@ hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no @@ -9,7 +9,7 @@ module_cmds= module_expsym_cmds= old_archive_from_new_cmds= -@@ -12844,7 +12844,7 @@ hardcode_automatic_CXX=no +@@ -12871,7 +12871,7 @@ inherit_rpath_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -18,13 +18,13 @@ old_archive_cmds_CXX=$old_archive_cmds reload_flag_CXX=$reload_flag reload_cmds_CXX=$reload_cmds -@@ -16486,6 +16486,9 @@ case $host_os in - *mingw32* ) - WERROR="" - ;; -+ freebsd* ) -+ WERROR="" -+ ;; - *) - ;; - esac +@@ -16512,6 +16512,9 @@ + WERROR="" + ;; + *mingw32* ) ++ WERROR="" ++ ;; ++ freebsd* ) + WERROR="" + ;; + *) diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist index f9fdc8da608e..4002fc40e41b 100644 --- a/devel/rudiments/pkg-plist +++ b/devel/rudiments/pkg-plist @@ -228,6 +228,6 @@ include/rudiments/xmlsax.h lib/librudiments.a lib/librudiments.so lib/librudiments.so.4 -lib/librudiments.so.4.0.2 +lib/librudiments.so.4.0.4 libdata/pkgconfig/rudiments.pc man/man1/rudiments-config.1.gz |