Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
databases/sqlrelay/patches/patch-ad
View File

@@ -1,13 +1,15 @@
$NetBSD: patch-ad,v 1.3 2014/05/27 13:24:43 fhajny Exp $
$NetBSD: patch-ad,v 1.4 2015/05/20 13:26:45 ryoon Exp $
We install init scripts ourselves.
--- Makefile.orig 2013-10-19 12:27:13.000000000 +0000
--- Makefile.orig 2015-03-31 20:50:58.000000000 +0000
+++ Makefile
@@ -17,7 +17,6 @@ install:
$(MAKE) -C src install
$(MAKE) -C bin install
$(MAKE) -C etc install
- $(MAKE) -C init install
$(MAKE) -C man install
$(MAKE) -C doc install
$(MKINSTALLDIRS) $(libdir)/pkgconfig
@@ -20,9 +20,6 @@ install-bin:
install-etc:
cd etc $(AND) $(MAKE) install
-install-init:
- cd init $(AND) $(MAKE) install
-
install-man:
cd man $(AND) $(MAKE) install

13
databases/sqlrelay/patches/patch-config.mk.in Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-config.mk.in,v 1.1 2015/05/20 13:26:45 ryoon Exp $
--- config.mk.in.orig 2015-04-18 05:29:10.000000000 +0000
+++ config.mk.in
@@ -778,7 +778,7 @@ MODULERENAME = $(top_builddir)/moduleren
# build directories
-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-pkgconfig
+INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-pkgconfig
UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-pkgconfig
ifeq ($(SQLRELAY_ENABLE_SHARED),yes)

19
databases/sqlrelay/patches/patch-configure
View File

@@ -1,9 +1,9 @@
$NetBSD: patch-configure,v 1.2 2014/05/27 13:24:43 fhajny Exp $
$NetBSD: patch-configure,v 1.3 2015/05/20 13:26:45 ryoon Exp $
Look for history/readline at proper places.
--- configure.orig 2014-03-26 14:50:53.000000000 +0000
--- configure.orig 2015-04-08 22:16:40.000000000 +0000
+++ configure
@@ -17557,7 +17557,7 @@ fi
@@ -17567,7 +17567,7 @@ fi
$as_echo_n "checking for history... " >&6; }
@@ -12,7 +12,7 @@ Look for history/readline at proper places.
NAME=history
HEADER=readline/history.h
LIBNAME=history
@@ -17893,7 +17893,7 @@ fi
@@ -17903,7 +17903,7 @@ fi
$as_echo_n "checking for readline... " >&6; }
@@ -21,7 +21,7 @@ Look for history/readline at proper places.
NAME=readline
HEADER=readline/readline.h
LIBNAME=readline
@@ -18501,7 +18501,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -18511,7 +18511,7 @@ rm -f core conftest.err conftest.$ac_obj
@@ -30,3 +30,12 @@ Look for history/readline at proper places.
NAME=iconv
HEADER=iconv.h
LIBNAME=iconv
@@ -32389,7 +32389,7 @@ print "arch = "
print CONFIG["arch"]
print "\n"
print "ruby_version = "
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
print "\n"
print "prefix = "
print CONFIG["prefix"].sub(drive, "")

32
databases/sqlrelay/patches/patch-etc_Makefile
View File

@@ -1,18 +1,24 @@
$NetBSD: patch-etc_Makefile,v 1.1 2014/05/22 12:50:48 fhajny Exp $
$NetBSD: patch-etc_Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $
Install config file examples properly.
--- etc/Makefile.orig 2012-05-21 04:54:54.000000000 +0000
--- etc/Makefile.orig 2015-03-16 04:08:11.000000000 +0000
+++ etc/Makefile
@@ -5,10 +5,8 @@ include ../config.mk
.PHONY: install uninstall
@@ -5,12 +5,12 @@ include ../config.mk
install:
- $(MKINSTALLDIRS) $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)
- $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)
+ $(INSTALL) -m 644 sqlrelay.dtd $(EXAMPLEDIR)
+ $(INSTALL) -m 644 sqlrelay.xsd $(EXAMPLEDIR)
$(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
$(MKINSTALLDIRS) $(sysconfdir)
$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
- $(CP) sqlrelay.conf.example $(sysconfdir)
- $(CHMOD) 644 $(sysconfdir)/sqlrelay.conf.example
- $(CP) sqlrelay.dtd $(sysconfdir)
- $(CHMOD) 644 $(sysconfdir)/sqlrelay.dtd
- $(CP) sqlrelay.xsd $(sysconfdir)
- $(CHMOD) 644 $(sysconfdir)/sqlrelay.xsd
+ $(CP) sqlrelay.conf.example $(EXAMPLEDIR)
+ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf.example
+ $(CP) sqlrelay.dtd $(EXAMPLEDIR)
+ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.dtd
+ $(CP) sqlrelay.xsd $(EXAMPLEDIR)
+ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.xsd
$(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf
uninstall:

14
databases/sqlrelay/patches/patch-init_rc.sqlrelay.in
View File

@@ -1,14 +0,0 @@
$NetBSD: patch-init_rc.sqlrelay.in,v 1.1 2014/05/22 12:50:48 fhajny Exp $
Instance definition under PKG_SYSCONFDIR.
--- init/rc.sqlrelay.in.orig 2013-10-20 02:33:20.000000000 +0000
+++ init/rc.sqlrelay.in
@@ -119,7 +119,7 @@ fi
# define instance file
-instances=/etc/sqlrelay
+instances=${sysconfdir}/sqlrelay
if ( test -r "/etc/sysconfig/sqlrelay" )
then
instances=/etc/sysconfig/sqlrelay

48
databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
View File

@@ -1,48 +0,0 @@
$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.1 2014/11/17 19:00:39 joerg Exp $
Don't mess with system headers by pretending to be C or removing defines.
Just expect php.h to work.
--- src/api/php/sql_relay.cpp.orig 2014-09-02 01:51:20.000000000 +0000
+++ src/api/php/sql_relay.cpp
@@ -3,39 +3,7 @@
#include <sqlrelay/sqlrclient.h>
-#ifdef WIN32
- #undef uid_t
- #undef gid_t
- #undef ssize_t
- #undef socklen_t
- #undef pid_t
- #undef mode_t
- #define PHP_WIN32
- #define ZEND_WIN32
- #define ZEND_DEBUG 0
- #define ZTS 1
-#endif
-
-extern "C" {
- #ifndef WIN32
- #ifdef __cplusplus
- #undef __cplusplus
- #define cpluspluswasdefined
- #endif
- #ifndef HAVE_SOCKLEN_T
- #define HAVE_SOCKLEN_T
- #endif
- #ifndef _WCHAR_T_DEFINED_
- #define _WCHAR_T_DEFINED_
- #endif
- #endif
- #include <php.h>
- #ifndef WIN32
- #ifdef cpluspluswasdefined
- #define __cplusplus
- #endif
- #endif
-}
+#include <php.h>
#include <config.h>

31
databases/sqlrelay/patches/patch-src_api_ruby_getcflags.rb Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-src_api_ruby_getcflags.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
* Fix Ruby 2.2 build.
--- src/api/ruby/getcflags.rb.orig 2011-07-16 00:49:53.000000000 +0000
+++ src/api/ruby/getcflags.rb
@@ -6,19 +6,19 @@ require "mkmf"
drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
print "\n"
print "arch = "
-print CONFIG["arch"]
+print RbConfig::CONFIG["arch"]
print "\n"
print "sitearch = "
-print CONFIG["sitearch"]
+print RbConfig::CONFIG["sitearch"]
print "\n"
print "ruby_version = "
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
print "\n"
print "prefix = "
-print CONFIG["prefix"].sub(drive, "")
+print RbConfig::CONFIG["prefix"].sub(drive, "")
print "\n"
print "exec_prefix = "
-print CONFIG["exec_prefix"].sub(drive, "")
+print RbConfig::CONFIG["exec_prefix"].sub(drive, "")
print "\n"
print "libdir = "
print $libdir.sub(drive, "")

31
databases/sqlrelay/patches/patch-src_api_ruby_getsitearchdir.rb Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-src_api_ruby_getsitearchdir.rb,v 1.1 2015/05/20 13:26:45 ryoon Exp $
* Fix Ruby 2.2 build.
--- src/api/ruby/getsitearchdir.rb.orig 2015-04-09 01:48:10.000000000 +0000
+++ src/api/ruby/getsitearchdir.rb
@@ -1,19 +1,19 @@
require "mkmf"
drive = File::PATH_SEPARATOR == ";" ? /\A\w:/ : /\A/
print "arch = "
-print CONFIG["arch"]
+print RbConfig::CONFIG["arch"]
print "\n"
print "sitearch = "
-print CONFIG["sitearch"]
+print RbConfig::CONFIG["sitearch"]
print "\n"
print "ruby_version = "
-print Config::CONFIG["ruby_version"]
+print RbConfig::CONFIG["ruby_version"]
print "\n"
print "prefix = "
-print CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","")
+print RbConfig::CONFIG["prefix"].sub(drive, "").sub("$(DESTDIR)","")
print "\n"
print "exec_prefix = "
-print CONFIG["exec_prefix"].sub(drive, "").sub("$(DESTDIR)","")
+print RbConfig::CONFIG["exec_prefix"].sub(drive, "").sub("$(DESTDIR)","")
print "\n"
print "libdir = "
print $libdir.sub(drive, "").sub("$(DESTDIR)","")