From 700050cae0003c18f9c1bf7f82e89c19c55d4624 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 21 May 2018 08:06:39 +0000 Subject: Removed (jdbc-)postgresql92(-*) --- databases/postgresql92/DESCR | 9 -- databases/postgresql92/Makefile | 15 --- databases/postgresql92/Makefile.common | 138 --------------------- databases/postgresql92/PLIST | 2 - databases/postgresql92/distinfo | 18 --- databases/postgresql92/files/GNUmakefile.libpq | 20 --- databases/postgresql92/files/dynloader-ltdl.h | 17 --- databases/postgresql92/options.mk | 53 -------- .../postgresql92/patches/patch-config_missing | 13 -- .../postgresql92/patches/patch-config_perl.m4 | 15 --- databases/postgresql92/patches/patch-configure | 23 ---- .../patches/patch-contrib_dblink_Makefile | 12 -- .../patches/patch-contrib_dblink_dblink.c | 13 -- .../postgresql92/patches/patch-src_Makefile.shlib | 51 -------- .../patches/patch-src_backend_Makefile | 15 --- .../patches/patch-src_backend_utils_adt_datetime.c | 14 --- ...patch-src_interfaces_ecpg_pgtypeslib_interval.c | 15 --- .../patches/patch-src_makefiles_Makefile.solaris | 10 -- .../patches/patch-src_pl_plperl_GNUmakefile | 21 ---- .../patches/patch-src_pl_plperl_plperl.h | 27 ---- 20 files changed, 501 deletions(-) delete mode 100644 databases/postgresql92/DESCR delete mode 100644 databases/postgresql92/Makefile delete mode 100644 databases/postgresql92/Makefile.common delete mode 100644 databases/postgresql92/PLIST delete mode 100644 databases/postgresql92/distinfo delete mode 100644 databases/postgresql92/files/GNUmakefile.libpq delete mode 100644 databases/postgresql92/files/dynloader-ltdl.h delete mode 100644 databases/postgresql92/options.mk delete mode 100644 databases/postgresql92/patches/patch-config_missing delete mode 100644 databases/postgresql92/patches/patch-config_perl.m4 delete mode 100644 databases/postgresql92/patches/patch-configure delete mode 100644 databases/postgresql92/patches/patch-contrib_dblink_Makefile delete mode 100644 databases/postgresql92/patches/patch-contrib_dblink_dblink.c delete mode 100644 databases/postgresql92/patches/patch-src_Makefile.shlib delete mode 100644 databases/postgresql92/patches/patch-src_backend_Makefile delete mode 100644 databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c delete mode 100644 databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c delete mode 100644 databases/postgresql92/patches/patch-src_makefiles_Makefile.solaris delete mode 100644 databases/postgresql92/patches/patch-src_pl_plperl_GNUmakefile delete mode 100644 databases/postgresql92/patches/patch-src_pl_plperl_plperl.h (limited to 'databases/postgresql92') diff --git a/databases/postgresql92/DESCR b/databases/postgresql92/DESCR deleted file mode 100644 index 9f6b5b5b0f9..00000000000 --- a/databases/postgresql92/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -PostgreSQL is a robust, next-generation, Object-Relational DBMS (ORDBMS), -derived from the Berkeley Postgres database management system. While -PostgreSQL retains the powerful object-relational data model, rich data types -and easy extensibility of Postgres, it replaces the PostQuel query language -with an extended subset of SQL. - -PostgreSQL is free and the complete source is available. - -This is the meta-package for the PostgreSQL database system. diff --git a/databases/postgresql92/Makefile b/databases/postgresql92/Makefile deleted file mode 100644 index 5c0d59e1b33..00000000000 --- a/databases/postgresql92/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile,v 1.14 2017/12/15 16:57:24 dholland Exp $ - -PKGNAME= ${DISTNAME:C/-/92-/} -PKGREVISION= 1 -COMMENT= Robust, next generation, object-relational DBMS - -DEPENDS+= postgresql92-client>=${PKGVERSION_NOREV}:../../databases/postgresql92-client -DEPENDS+= postgresql92-docs>=${PKGVERSION_NOREV}:../../databases/postgresql92-docs -DEPENDS+= postgresql92-server>=${PKGVERSION_NOREV}:../../databases/postgresql92-server - -META_PACKAGE= yes - -.include "Makefile.common" - -.include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common deleted file mode 100644 index d262d0d660c..00000000000 --- a/databases/postgresql92/Makefile.common +++ /dev/null @@ -1,138 +0,0 @@ -# $NetBSD: Makefile.common,v 1.35 2017/12/15 16:52:23 dholland Exp $ -# -# This Makefile fragment is included by all PostgreSQL packages built from -# the main sources of the PostgreSQL distribution except jdbc-postgresql. -# -# The PostgreSQL package naming scheme, aside from the obvious piecewise -# packages, is as follows: -# -postgresql client-side interface to PostgreSQL -# postgresql- server-side module for PostgreSQL backend -# -# used by databases/postgresql92-client/Makefile -# used by databases/postgresql92-contrib/Makefile -# used by databases/postgresql92-docs/Makefile -# used by databases/postgresql92-plperl/Makefile -# used by databases/postgresql92-plpython/Makefile -# used by databases/postgresql92-pltcl/Makefile -# used by databases/postgresql92-server/Makefile - -DISTNAME= postgresql-9.2.24 -CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER?= adam@NetBSD.org -HOMEPAGE= https://www.postgresql.org/ -LICENSE= postgresql-license - -CONFLICTS+= postgresql-[0-9]* -CONFLICTS+= postgresql[0-8][0-9]-[0-9]* -CONFLICTS+= postgresql9[013-9]-[0-9]* - -.if !empty(PKGNAME:M*-*-*) -module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//} -CONFLICTS+= postgresql[0-8][0-9]-${module}-[0-9]* -CONFLICTS+= postgresql9[013-9]-${module}-[0-9]* -.endif - -DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql92/distinfo -COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql92/files -PATCHDIR?= ${.CURDIR}/../../databases/postgresql92/patches - -USE_PKGLOCALEDIR= yes -USE_TOOLS+= bison gmake lex msgfmt -PKG_SYSCONFSUBDIR= postgresql - -.include "../../mk/bsd.prefs.mk" - -PG_TEMPLATE.SunOS= solaris -PG_TEMPLATE.IRIX= irix5 -PG_TEMPLATE.MirBSD= openbsd -.if !defined(PG_TEMPLATE.${OPSYS}) -PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS} -.endif - -PG_DATA_DIR= ${PREFIX}/share/postgresql -PG_DOC_DIR= ${PREFIX}/share/doc/postgresql -PG_LOCALE_DIR= ${PREFIX}/${PKGLOCALEDIR}/locale -PG_ETC_DIR= ${PKG_SYSCONFDIR} - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR} -CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR} -CONFIGURE_ARGS+= --docdir=${PG_DOC_DIR} -CONFIGURE_ARGS+= --localedir=${PG_LOCALE_DIR} -CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}} - -CONFIGURE_ARGS+= --enable-nls -CONFIGURE_ARGS+= --with-libxml -CONFIGURE_ARGS+= --with-readline -CONFIGURE_ARGS+= --without-perl -CONFIGURE_ARGS+= --without-python -CONFIGURE_ARGS+= --without-tcl - -# sys/ucred.h shouldn't be included on Solaris, causes conflicts between -# procfs and largefile. -CONFIGURE_ENV.SunOS+= ac_cv_header_sys_ucred_h=no - -# pkgsrc silently filters the --as-needed linker arg, but that makes -# it leak into the pgxs Makefiles and compromises manual building -# against PostgreSQL files installed. Disable it here to prevent -# that from happening. -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" -CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no -.endif - -# configure fails on OpenBSD and MirBSD if thread safety is enabled. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety - -# PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block. -# This also limits the size of a tuple. The valid values are powers -# of 2 up to 32768, and the default size is 8196. Please don't change -# this value unless you know what you are doing. -BUILD_DEFS+= PGSQL_BLCKSZ -.if defined(PGSQL_BLCKSZ) -CONFIGURE_ARGS+= --with-blocksize=${PGSQL_BLCKSZ} -.endif - -# PostgreSQL explicitly forbids any use of -ffast-math -BUILDLINK_TRANSFORM+= rm:-ffast-math - -# USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl -# to provide "dlopen" functionality for the PostgreSQL backend. -.if ${OPSYS} == "Interix" -USE_LIBLTDL?= yes -.endif -USE_LIBLTDL?= no - -.include "../../devel/gettext-lib/buildlink3.mk" -LIBS.SunOS+= -lintl -.include "../../devel/zlib/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" - -.include "../../mk/readline.buildlink3.mk" -.if ${READLINE_TYPE} == "editline" -CONFIGURE_ARGS+= --with-libedit-preferred -.endif - -.if !defined(META_PACKAGE) -post-extract: -. if !empty(USE_LIBLTDL:M[yY][eE][sS]) - cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \ - ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h - ${ECHO} "static int dummy = 0;" \ - > ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c -. endif - touch ${WRKSRC}/src/template/dragonfly - cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.c - cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \ - ${WRKSRC}/src/backend/port/dynloader/dragonfly.h - cp ${WRKSRC}/src/include/port/freebsd.h \ - ${WRKSRC}/src/include/port/dragonfly.h - cp ${WRKSRC}/src/makefiles/Makefile.freebsd \ - ${WRKSRC}/src/makefiles/Makefile.dragonfly -.endif - -.include "../../databases/postgresql92/options.mk" diff --git a/databases/postgresql92/PLIST b/databases/postgresql92/PLIST deleted file mode 100644 index 615a190815b..00000000000 --- a/databases/postgresql92/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2012/10/05 21:03:10 adam Exp $ -@comment this plist intentionally left empty diff --git a/databases/postgresql92/distinfo b/databases/postgresql92/distinfo deleted file mode 100644 index d29faa40660..00000000000 --- a/databases/postgresql92/distinfo +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: distinfo,v 1.27 2018/01/22 11:05:29 jperkin Exp $ - -SHA1 (postgresql-9.2.24.tar.bz2) = 63d6966ccdbab6aae1f9754fdb8e341ada1ef653 -RMD160 (postgresql-9.2.24.tar.bz2) = 2fc1b9c37cfefd5fae5bd02f974484c5fc680c08 -SHA512 (postgresql-9.2.24.tar.bz2) = a6f043e5ef5e12e23c1c43b26a5ecafce62f3a86f38b5b85e7cb0cb7aa376d40e460a526baf67ae40de40525e4744fb5e48650ee5e007db4ce9742fcf548bd56 -Size (postgresql-9.2.24.tar.bz2) = 16552576 bytes -SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 -SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0 -SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747 -SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04 -SHA1 (patch-contrib_dblink_dblink.c) = 245ce06df88837ba88142aea1d0ba787d65ddb45 -SHA1 (patch-src_Makefile.shlib) = b78433e03e8bc151fa837c3812f0ca5f00709c6f -SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5 -SHA1 (patch-src_backend_utils_adt_datetime.c) = b220c39272bf8d2bda95119adcbab5b2495990d8 -SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 20578ab950465db07dab757db2fae4c4570cbbe1 -SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0 -SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07 -SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174 diff --git a/databases/postgresql92/files/GNUmakefile.libpq b/databases/postgresql92/files/GNUmakefile.libpq deleted file mode 100644 index 328d0b313bf..00000000000 --- a/databases/postgresql92/files/GNUmakefile.libpq +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: GNUmakefile.libpq,v 1.1 2012/10/05 21:03:10 adam Exp $ -# -# This GNUmakefile overrides the `all' target of $(libpq_srcdir)/Makefile -# to be empty if INSTALLED_LIBPQ is defined. This handles the submake -# targets sprinkled throughout the PostgreSQL Makefiles that execute -# -# @$(MAKE) -C $(libpq_builddir) all -# -# to ensure that the libpq libraries are built first. If INSTALLED_LIBPQ -# is defined, then have the `all' target simple return success. - -ifdef INSTALLED_LIBPQ -all: - @test -f libpq.a || touch libpq.a -endif - -%: force - @$(MAKE) -f Makefile $@ - -force: ; diff --git a/databases/postgresql92/files/dynloader-ltdl.h b/databases/postgresql92/files/dynloader-ltdl.h deleted file mode 100644 index e8e46620033..00000000000 --- a/databases/postgresql92/files/dynloader-ltdl.h +++ /dev/null @@ -1,17 +0,0 @@ -/* $NetBSD: dynloader-ltdl.h,v 1.1 2012/10/05 21:03:10 adam Exp $ */ - -/* - * dynamic loader based on libltdl - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include "utils/dynamic_loader.h" - -#define pg_dlopen(a) ((void *)lt_dlopen(a)) -#define pg_dlsym(a,b) lt_dlsym((lt_dlhandle)(a), (b)) -#define pg_dlclose(a) lt_dlclose((lt_dlhandle)(a)) -#define pg_dlerror lt_dlerror - -#endif /* PORT_PROTOS_H */ diff --git a/databases/postgresql92/options.mk b/databases/postgresql92/options.mk deleted file mode 100644 index be8a9959d52..00000000000 --- a/databases/postgresql92/options.mk +++ /dev/null @@ -1,53 +0,0 @@ -# $NetBSD: options.mk,v 1.6 2017/12/15 16:52:23 dholland Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql92 -PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam -PKG_SUGGESTED_OPTIONS= kerberos - -.include "../../mk/bsd.options.mk" - -# Bonjour support -.if !empty(PKG_OPTIONS:Mbonjour) -CONFIGURE_ARGS+= --with-bonjour -. if ${OPSYS} != "Darwin" -LIBS+= -ldns_sd -. endif -. include "../../net/mDNSResponder/buildlink3.mk" -.endif - -# Dtrace support -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --enable-dtrace -.endif - -# Kerberos5 authentication for the PostgreSQL backend -.if !empty(PKG_OPTIONS:Mkerberos) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-krb5 -CONFIGURE_ARGS+= --with-gssapi - -CHECK_BUILTIN.${KRB5_TYPE}:= yes -.include "../../security/${KRB5_TYPE}/builtin.mk" -CHECK_BUILTIN.${KRB5_TYPE}:= no - -. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS]) && \ - exists(${SH_KRB5_CONFIG}) -CFLAGS_KRB5!= ${SH_KRB5_CONFIG} --cflags -CPPFLAGS+= ${CFLAGS_KRB5} -. endif -.else -CONFIGURE_ARGS+= --without-krb5 -CONFIGURE_ARGS+= --without-gssapi -.endif - -# LDAP authentication for the PostgreSQL backend -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-ldap -.endif - -# PAM authentication for the PostgreSQL backend -.if !empty(PKG_OPTIONS:Mpam) -. include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam -.endif diff --git a/databases/postgresql92/patches/patch-config_missing b/databases/postgresql92/patches/patch-config_missing deleted file mode 100644 index 92c03021863..00000000000 --- a/databases/postgresql92/patches/patch-config_missing +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-config_missing,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- config/missing.orig 2012-10-05 12:14:55.000000000 +0000 -+++ config/missing -@@ -40,7 +40,7 @@ pre-packaged $1 output. - ERROR: Perl is missing on your system. It is needed unless you are building - from an unmodified official distribution of PostgreSQL. - ***" >&2 -- exit 1 -+ exit 0 - ;; - - *) diff --git a/databases/postgresql92/patches/patch-config_perl.m4 b/databases/postgresql92/patches/patch-config_perl.m4 deleted file mode 100644 index 107b37d1aba..00000000000 --- a/databases/postgresql92/patches/patch-config_perl.m4 +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config_perl.m4,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- config/perl.m4.orig 2010-02-23 18:35:06.000000000 +0000 -+++ config/perl.m4 -@@ -57,9 +57,7 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS], - AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS], - [AC_REQUIRE([PGAC_PATH_PERL]) - AC_MSG_CHECKING(for flags to link embedded Perl) --pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts` --pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'` --perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]` -+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts` - AC_SUBST(perl_embed_ldflags)dnl - if test -z "$perl_embed_ldflags" ; then - AC_MSG_RESULT(no) diff --git a/databases/postgresql92/patches/patch-configure b/databases/postgresql92/patches/patch-configure deleted file mode 100644 index 36b4925d5f9..00000000000 --- a/databases/postgresql92/patches/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- configure.orig 2012-09-19 21:47:58.000000000 +0000 -+++ configure -@@ -2188,6 +2188,7 @@ case $host_os in - darwin*) template=darwin ;; - dragonfly*) template=netbsd ;; - freebsd*) template=freebsd ;; -+ dragonfly*) template=dragonfly ;; - hpux*) template=hpux ;; - irix*) template=irix ;; - linux*|gnu*|k*bsd*-gnu) -@@ -7251,9 +7252,7 @@ $as_echo "$perl_useshrplib" >&6; } - - { $as_echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5 - $as_echo_n "checking for flags to link embedded Perl... " >&6; } --pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts` --pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'` --perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"` -+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts` - if test -z "$perl_embed_ldflags" ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } diff --git a/databases/postgresql92/patches/patch-contrib_dblink_Makefile b/databases/postgresql92/patches/patch-contrib_dblink_Makefile deleted file mode 100644 index 1090bdecda0..00000000000 --- a/databases/postgresql92/patches/patch-contrib_dblink_Makefile +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-contrib_dblink_Makefile,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- contrib/dblink/Makefile.orig 2011-09-15 06:35:28.000000000 +0000 -+++ contrib/dblink/Makefile -@@ -4,7 +4,6 @@ MODULE_big = dblink - OBJS = dblink.o - PG_CPPFLAGS = -I$(libpq_srcdir) - SHLIB_LINK = $(libpq) --SHLIB_PREREQS = submake-libpq - - EXTENSION = dblink - DATA = dblink--1.0.sql dblink--unpackaged--1.0.sql diff --git a/databases/postgresql92/patches/patch-contrib_dblink_dblink.c b/databases/postgresql92/patches/patch-contrib_dblink_dblink.c deleted file mode 100644 index cc6a8e91924..00000000000 --- a/databases/postgresql92/patches/patch-contrib_dblink_dblink.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-contrib_dblink_dblink.c,v 1.2 2013/04/04 21:08:36 adam Exp $ - ---- contrib/dblink/dblink.c.orig 2013-04-01 18:20:36.000000000 +0000 -+++ contrib/dblink/dblink.c -@@ -46,7 +46,7 @@ - #include "parser/scansup.h" - #include "utils/acl.h" - #include "utils/builtins.h" --#include "utils/fmgroids.h" -+#include "postgresql/server/utils/fmgroids.h" - #include "utils/guc.h" - #include "utils/lsyscache.h" - #include "utils/memutils.h" diff --git a/databases/postgresql92/patches/patch-src_Makefile.shlib b/databases/postgresql92/patches/patch-src_Makefile.shlib deleted file mode 100644 index ffc5bfd4c91..00000000000 --- a/databases/postgresql92/patches/patch-src_Makefile.shlib +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-src_Makefile.shlib,v 1.2 2018/01/22 11:05:29 jperkin Exp $ - -Use correct linker flags. - ---- src/Makefile.shlib.orig 2017-11-06 22:17:39.000000000 +0000 -+++ src/Makefile.shlib -@@ -159,17 +159,11 @@ endif - - ifeq ($(PORTNAME), freebsd) - ifdef ELF_SYSTEM -- ifdef SO_MAJOR_VERSION -- shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) -- endif - LINK.shared = $(COMPILER) -shared - ifdef soname - LINK.shared += -Wl,-x,-soname,$(soname) - endif - else -- ifdef SO_MAJOR_VERSION -- shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) -- endif - LINK.shared = $(LD) -x -Bshareable -Bforcearchive - endif - endif -@@ -185,6 +179,17 @@ ifeq ($(PORTNAME), netbsd) - endif - endif - -+ifeq ($(PORTNAME), dragonfly) -+ ifdef ELF_SYSTEM -+ LINK.shared = $(COMPILER) -shared -+ ifdef soname -+ LINK.shared += -Wl,-x,-soname,$(soname) -+ endif -+ else -+ LINK.shared = $(LD) -x -Bshareable -Bforcearchive -+ endif -+endif -+ - ifeq ($(PORTNAME), hpux) - ifdef SO_MAJOR_VERSION - shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) -@@ -250,7 +255,7 @@ ifeq ($(PORTNAME), solaris) - ifeq ($(with_gnu_ld), yes) - LINK.shared += -Wl,-soname,$(soname) - else -- LINK.shared += -h $(soname) -+ LINK.shared += -Wl,-h,$(soname) - endif - endif - endif diff --git a/databases/postgresql92/patches/patch-src_backend_Makefile b/databases/postgresql92/patches/patch-src_backend_Makefile deleted file mode 100644 index 3b030a1cedc..00000000000 --- a/databases/postgresql92/patches/patch-src_backend_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_backend_Makefile,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- src/backend/Makefile.orig 2010-07-05 18:54:37.000000000 +0000 -+++ src/backend/Makefile -@@ -17,6 +17,10 @@ subdir = src/backend - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - -+CFLAGS+= $(DL_CFLAGS) -+LDFLAGS+= $(DL_LDFLAGS) -+LIBS+= $(DL_LIBS) -+ - SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \ - main nodes optimizer port postmaster regex replication rewrite \ - storage tcop tsearch utils $(top_builddir)/src/timezone diff --git a/databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c b/databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c deleted file mode 100644 index 8de009bcc93..00000000000 --- a/databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $ - ---- src/backend/utils/adt/datetime.c.orig 2014-07-21 19:12:31.000000000 +0000 -+++ src/backend/utils/adt/datetime.c -@@ -30,6 +30,9 @@ - #include "utils/memutils.h" - #include "utils/tzparser.h" - -+#if defined(__NetBSD__) -+#define strtoi pg_strtoi -+#endif - - static int DecodeNumber(int flen, char *field, bool haveTextMonth, - int fmask, int *tmask, diff --git a/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c deleted file mode 100644 index 79dd4080216..00000000000 --- a/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:34 adam Exp $ - ---- src/interfaces/ecpg/pgtypeslib/interval.c.orig 2016-05-23 12:13:46.000000000 +0000 -+++ src/interfaces/ecpg/pgtypeslib/interval.c -@@ -14,6 +14,10 @@ - #include "pgtypes_error.h" - #include "pgtypes_interval.h" - -+#if defined(__NetBSD__) -+#define strtoi pg_strtoi -+#endif -+ - /* copy&pasted from .../src/backend/utils/adt/datetime.c */ - static int - strtoint(const char *nptr, char **endptr, int base) diff --git a/databases/postgresql92/patches/patch-src_makefiles_Makefile.solaris b/databases/postgresql92/patches/patch-src_makefiles_Makefile.solaris deleted file mode 100644 index e4650311a18..00000000000 --- a/databases/postgresql92/patches/patch-src_makefiles_Makefile.solaris +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-src_makefiles_Makefile.solaris,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- src/makefiles/Makefile.solaris.orig 2011-09-23 00:00:48.000000000 +0200 -+++ src/makefiles/Makefile.solaris 2011-10-11 11:53:51.948565783 +0200 -@@ -23,5 +23,3 @@ ifeq ($(GCC), yes) - else - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -G -o $@ $< - endif -- --sqlmansect = 5sql diff --git a/databases/postgresql92/patches/patch-src_pl_plperl_GNUmakefile b/databases/postgresql92/patches/patch-src_pl_plperl_GNUmakefile deleted file mode 100644 index e32624814a8..00000000000 --- a/databases/postgresql92/patches/patch-src_pl_plperl_GNUmakefile +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_pl_plperl_GNUmakefile,v 1.1 2012/10/05 21:03:10 adam Exp $ - ---- src/pl/plperl/GNUmakefile.orig 2012-02-23 22:53:36.000000000 +0000 -+++ src/pl/plperl/GNUmakefile -@@ -60,7 +60,6 @@ XSUBPPDIR = $(shell $(PERL) -e 'use List - - include $(top_srcdir)/src/Makefile.shlib - --plperl.o: perlchunks.h plperl_opmask.h plperl_helpers.h - - plperl_opmask.h: plperl_opmask.pl - @if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi -@@ -70,7 +69,7 @@ perlchunks.h: $(PERLCHUNKS) - @if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi - $(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > $@ - --all: all-lib -+all: perlchunks.h plperl_opmask.h plperl_helpers.h all-lib - - SPI.c: SPI.xs plperl_helpers.h - @if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi diff --git a/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h deleted file mode 100644 index 56d5cb59bf2..00000000000 --- a/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:17 adam Exp $ - ---- src/pl/plperl/plperl.h.orig 2017-08-07 21:19:50.000000000 +0000 -+++ src/pl/plperl/plperl.h -@@ -44,6 +44,10 @@ - #undef vsnprintf - #endif - -+#ifdef __sun -+#define list_head sun_list_head -+#define list_tail sun_list_tail -+#endif - - /* - * Get the basic Perl API. We use PERL_NO_GET_CONTEXT mode so that our code -@@ -62,6 +66,11 @@ - #include "XSUB.h" - #endif - -+#ifdef __sun -+#undef list_head -+#undef list_tail -+#endif -+ - /* put back our snprintf and vsnprintf */ - #ifdef USE_REPL_SNPRINTF - #ifdef snprintf -- cgit v1.2.3