From f57bc4af665126de839ff734a08e57726e84da84 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 10 Sep 2018 13:11:23 +0000 Subject: After an include, PLIST_SUB must be appended to, not overwritten. If it is overwritten, many values will be clobbered, and pain will ensue. PR: 230864 Submitted by: mat exp-runs by: antoine --- databases/dbh/Makefile | 4 ++-- databases/libgda5/Makefile | 2 +- databases/pglogical/Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'databases') diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile index d84b7abb74e2..9e8be08ad7dd 100644 --- a/databases/dbh/Makefile +++ b/databases/dbh/Makefile @@ -28,10 +28,10 @@ GTKDOC_DESC= Enable GTK html documentation .if ${PORT_OPTIONS:MGTKDOC} CONFIGURE_ARGS+= --enable-gtk-doc-html -PLIST_SUB= GTKDOC="" +PLIST_SUB+= GTKDOC="" .else CONFIGURE_ARGS+= --disable-gtk-doc-html -PLIST_SUB= GTKDOC="@comment " +PLIST_SUB+= GTKDOC="@comment " .endif post-patch: diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile index 99ae80381e4d..f8634daddc40 100644 --- a/databases/libgda5/Makefile +++ b/databases/libgda5/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS= --without-oracle \ .include VERSION= 5.0 -PLIST_SUB= VERSION=${VERSION} +PLIST_SUB+= VERSION=${VERSION} .if ${LIBGDA5_SLAVE}!="no" USE_GNOME+= libgda5 diff --git a/databases/pglogical/Makefile b/databases/pglogical/Makefile index f7fef5b17873..3b1229bdfbeb 100644 --- a/databases/pglogical/Makefile +++ b/databases/pglogical/Makefile @@ -29,9 +29,9 @@ DOCS_PORTDOCS= * .include .if ${PGSQL_VER:M9.4} -PLIST_SUB= PGSQL94="" +PLIST_SUB+= PGSQL94="" .else -PLIST_SUB= PGSQL94="@comment " +PLIST_SUB+= PGSQL94="@comment " .endif # FFI -- cgit v1.2.3