[pkgsrc/trunk]: pkgsrc/databases Remove unused files; cleanup

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d216eb3f078f
branches:  trunk
changeset: 415470:d216eb3f078f
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Oct 07 19:28:28 2019 +0000

description:
Remove unused files; cleanup

diffstat:

 databases/postgresql10/Makefile.common         |  14 +++++++-------
 databases/postgresql10/files/GNUmakefile.libpq |  20 --------------------
 databases/postgresql11/Makefile.common         |  14 +++++++-------
 databases/postgresql11/files/GNUmakefile.libpq |  20 --------------------
 databases/postgresql94/Makefile.common         |  14 +++++++-------
 databases/postgresql94/files/GNUmakefile.libpq |  20 --------------------
 databases/postgresql95/Makefile.common         |  14 +++++++-------
 databases/postgresql95/files/GNUmakefile.libpq |  20 --------------------
 databases/postgresql96/Makefile.common         |  14 +++++++-------
 databases/postgresql96/files/GNUmakefile.libpq |  20 --------------------
 10 files changed, 35 insertions(+), 135 deletions(-)

diffs (295 lines):

diff -r a965899075b5 -r d216eb3f078f databases/postgresql10/Makefile.common
--- a/databases/postgresql10/Makefile.common    Mon Oct 07 19:23:34 2019 +0000
+++ b/databases/postgresql10/Makefile.common    Mon Oct 07 19:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2019/08/11 11:40:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/10/07 19:28:28 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -120,19 +120,19 @@
 .if !defined(META_PACKAGE)
 post-extract:
 .  if !empty(USE_LIBLTDL:M[yY][eE][sS])
-       cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+       ${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 \
+       ${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 \
+       ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
                ${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-       cp ${WRKSRC}/src/include/port/freebsd.h \
+       ${CP} ${WRKSRC}/src/include/port/freebsd.h \
                ${WRKSRC}/src/include/port/dragonfly.h
-       cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+       ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
                ${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
 
diff -r a965899075b5 -r d216eb3f078f databases/postgresql10/files/GNUmakefile.libpq
--- a/databases/postgresql10/files/GNUmakefile.libpq    Mon Oct 07 19:23:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: GNUmakefile.libpq,v 1.1 2017/10/23 20:33:49 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 -r a965899075b5 -r d216eb3f078f databases/postgresql11/Makefile.common
--- a/databases/postgresql11/Makefile.common    Mon Oct 07 19:23:34 2019 +0000
+++ b/databases/postgresql11/Makefile.common    Mon Oct 07 19:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2019/08/11 11:40:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2019/10/07 19:28:28 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -120,19 +120,19 @@
 .if !defined(META_PACKAGE)
 post-extract:
 .  if !empty(USE_LIBLTDL:M[yY][eE][sS])
-       cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+       ${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 \
+       ${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 \
+       ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
                ${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-       cp ${WRKSRC}/src/include/port/freebsd.h \
+       ${CP} ${WRKSRC}/src/include/port/freebsd.h \
                ${WRKSRC}/src/include/port/dragonfly.h
-       cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+       ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
                ${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
 
diff -r a965899075b5 -r d216eb3f078f databases/postgresql11/files/GNUmakefile.libpq
--- a/databases/postgresql11/files/GNUmakefile.libpq    Mon Oct 07 19:23:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: GNUmakefile.libpq,v 1.1 2018/10/23 16:02:51 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 -r a965899075b5 -r d216eb3f078f databases/postgresql94/Makefile.common
--- a/databases/postgresql94/Makefile.common    Mon Oct 07 19:23:34 2019 +0000
+++ b/databases/postgresql94/Makefile.common    Mon Oct 07 19:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2019/08/11 11:40:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.33 2019/10/07 19:28:29 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -119,19 +119,19 @@
 .if !defined(META_PACKAGE)
 post-extract:
 .  if !empty(USE_LIBLTDL:M[yY][eE][sS])
-       cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+       ${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 \
+       ${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 \
+       ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
                ${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-       cp ${WRKSRC}/src/include/port/freebsd.h \
+       ${CP} ${WRKSRC}/src/include/port/freebsd.h \
                ${WRKSRC}/src/include/port/dragonfly.h
-       cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+       ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
                ${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
 
diff -r a965899075b5 -r d216eb3f078f databases/postgresql94/files/GNUmakefile.libpq
--- a/databases/postgresql94/files/GNUmakefile.libpq    Mon Oct 07 19:23:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: GNUmakefile.libpq,v 1.1 2015/01/14 21:01:18 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 -r a965899075b5 -r d216eb3f078f databases/postgresql95/Makefile.common
--- a/databases/postgresql95/Makefile.common    Mon Oct 07 19:23:34 2019 +0000
+++ b/databases/postgresql95/Makefile.common    Mon Oct 07 19:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2019/08/11 11:40:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.27 2019/10/07 19:28:29 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -119,19 +119,19 @@
 .if !defined(META_PACKAGE)
 post-extract:
 .  if !empty(USE_LIBLTDL:M[yY][eE][sS])
-       cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+       ${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 \
+       ${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 \
+       ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
                ${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-       cp ${WRKSRC}/src/include/port/freebsd.h \
+       ${CP} ${WRKSRC}/src/include/port/freebsd.h \
                ${WRKSRC}/src/include/port/dragonfly.h
-       cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+       ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
                ${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
 
diff -r a965899075b5 -r d216eb3f078f databases/postgresql95/files/GNUmakefile.libpq
--- a/databases/postgresql95/files/GNUmakefile.libpq    Mon Oct 07 19:23:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: GNUmakefile.libpq,v 1.1 2016/02/25 21:37:35 tnn 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 -r a965899075b5 -r d216eb3f078f databases/postgresql96/Makefile.common
--- a/databases/postgresql96/Makefile.common    Mon Oct 07 19:23:34 2019 +0000
+++ b/databases/postgresql96/Makefile.common    Mon Oct 07 19:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2019/08/11 11:40:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2019/10/07 19:28:29 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -119,19 +119,19 @@
 .if !defined(META_PACKAGE)
 post-extract:
 .  if !empty(USE_LIBLTDL:M[yY][eE][sS])
-       cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
+       ${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 \
+       ${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 \
+       ${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
                ${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-       cp ${WRKSRC}/src/include/port/freebsd.h \
+       ${CP} ${WRKSRC}/src/include/port/freebsd.h \
                ${WRKSRC}/src/include/port/dragonfly.h
-       cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+       ${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd \
                ${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
 
diff -r a965899075b5 -r d216eb3f078f databases/postgresql96/files/GNUmakefile.libpq
--- a/databases/postgresql96/files/GNUmakefile.libpq    Mon Oct 07 19:23:34 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: GNUmakefile.libpq,v 1.1 2016/10/29 19:41:55 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: ;