+++ /dev/null
---- a/src/Makefile.shlib
-+++ b/src/Makefile.shlib
-@@ -391,14 +391,27 @@ endif # PORTNAME == cygwin || PORTNAME =
-
-
- %.pc: $(MAKEFILE_LIST)
-- echo 'Name: lib$(NAME)' >$@
-+ echo 'prefix=$(prefix)' >$@
-+ echo 'exec_prefix=$(exec_prefix)' >>$@
-+ifeq ($(patsubst $(prefix)/%,,$(includedir)),)
-+ echo 'includedir=$${prefix}/$(patsubst $(prefix)/%,%,$(includedir))' >>$@
-+else
-+ echo 'includedir=$(includedir)' >>$@
-+endif
-+ifeq ($(patsubst $(exec_prefix)/%,,$(libdir)),)
-+ echo 'libdir=$${exec_prefix}/$(patsubst $(exec_prefix)/%,%,$(libdir))' >>$@
-+else
-+ echo 'libdir=$(libdir)' >>$@
-+endif
-+ echo >>$@
-+ echo 'Name: lib$(NAME)' >>$@
- echo 'Description: PostgreSQL lib$(NAME) library' >>$@
- echo 'Url: $(PACKAGE_URL)' >>$@
- echo 'Version: $(VERSION)' >>$@
- echo 'Requires: ' >>$@
- echo 'Requires.private: $(PKG_CONFIG_REQUIRES_PRIVATE)' >>$@
-- echo 'Cflags: -I$(includedir)' >>$@
-- echo 'Libs: -L$(libdir) -l$(NAME)' >>$@
-+ echo 'Cflags: -I$${includedir}' >>$@
-+ echo 'Libs: -L$${libdir} -l$(NAME)' >>$@
- # Record -L flags that the user might have passed in to the PostgreSQL
- # build to locate third-party libraries (e.g., ldap, ssl). Filter out
- # those that point inside the build or source tree. Use sort to
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
-@@ -94,6 +94,7 @@ static char *event_source = NULL;
+@@ -96,6 +96,7 @@ static char *event_source = NULL;
static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */
static char *register_username = NULL;
static char *register_password = NULL;
static char *argv0 = NULL;
static bool allow_core_files = false;
static time_t start_time;
-@@ -2081,6 +2082,9 @@ do_help(void)
+@@ -2086,6 +2087,9 @@ do_help(void)
#endif
printf(_(" -s, --silent only print errors, no informational messages\n"));
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -w, --wait wait until operation completes (default)\n"));
printf(_(" -W, --no-wait do not wait until operation completes\n"));
-@@ -2293,6 +2297,7 @@ main(int argc, char **argv)
+@@ -2298,6 +2302,7 @@ main(int argc, char **argv)
{"options", required_argument, NULL, 'o'},
{"silent", no_argument, NULL, 's'},
{"timeout", required_argument, NULL, 't'},
{"core-files", no_argument, NULL, 'c'},
{"wait", no_argument, NULL, 'w'},
{"no-wait", no_argument, NULL, 'W'},
-@@ -2333,20 +2338,6 @@ main(int argc, char **argv)
+@@ -2338,20 +2343,6 @@ main(int argc, char **argv)
}
}
env_wait = getenv("PGCTLTIMEOUT");
if (env_wait != NULL)
-@@ -2432,11 +2423,15 @@ main(int argc, char **argv)
+@@ -2437,11 +2428,15 @@ main(int argc, char **argv)
wait_seconds_arg = true;
break;
case 'U':
break;
case 'w':
do_wait = true;
-@@ -2518,6 +2513,41 @@ main(int argc, char **argv)
+@@ -2523,6 +2518,41 @@ main(int argc, char **argv)
exit(1);
}