Convert contrib modules to use the extension facility.

This isn't fully tested as yet, in particular I'm not sure that the
"foo--unpackaged--1.0.sql" scripts are OK.  But it's time to get some
buildfarm cycles on it.

sepgsql is not converted to an extension, mainly because it seems to
require a very nonstandard installation process.

Dimitri Fontaine and Tom Lane

6 files changed, 12 insertions, 15 deletions

diff --git a/contrib/pg_freespacemap/.gitignore b/contrib/pg_freespacemap/.gitignore
deleted file mode 100644
index 645433a39f..0000000000
--- a/contrib/pg_freespacemap/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/pg_freespacemap.sql
diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile
index 65539d5d71..b2e3ba3aa3 100644
--- a/contrib/pg_freespacemap/Makefile
+++ b/contrib/pg_freespacemap/Makefile
@@ -3,8 +3,8 @@
 MODULE_big = pg_freespacemap
 OBJS = pg_freespacemap.o
 
-DATA_built = pg_freespacemap.sql
-DATA = uninstall_pg_freespacemap.sql
+EXTENSION = pg_freespacemap
+DATA = pg_freespacemap--1.0.sql pg_freespacemap--unpackaged--1.0.sql
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_freespacemap/pg_freespacemap.sql.in b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql
index 5ef8ba46ad..19f099ee37 100644
--- a/contrib/pg_freespacemap/pg_freespacemap.sql.in
+++ b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql
@@ -1,8 +1,4 @@
-/* contrib/pg_freespacemap/pg_freespacemap.sql.in */
-
--- Adjust this setting to control where the objects get created.
-SET search_path = public;
-
+/* contrib/pg_freespacemap/pg_freespacemap--1.0.sql */
 
 -- Register the C function.
 CREATE OR REPLACE FUNCTION pg_freespace(regclass, bigint)
diff --git a/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
new file mode 100644
index 0000000000..4c7487fa4e
--- /dev/null
+++ b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
@@ -0,0 +1,4 @@
+/* contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql */
+
+ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass,bigint);
+ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass);
diff --git a/contrib/pg_freespacemap/pg_freespacemap.control b/contrib/pg_freespacemap/pg_freespacemap.control
new file mode 100644
index 0000000000..34b695ff75
--- /dev/null
+++ b/contrib/pg_freespacemap/pg_freespacemap.control
@@ -0,0 +1,5 @@
+# pg_freespacemap extension
+comment = 'examine the free space map (FSM)'
+default_version = '1.0'
+module_pathname = '$libdir/pg_freespacemap'
+relocatable = true
diff --git a/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql b/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql
deleted file mode 100644
index 168506708a..0000000000
--- a/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-/* contrib/pg_freespacemap/uninstall_pg_freespacemap.sql */
-
--- Adjust this setting to control where the objects get dropped.
-SET search_path = public;
-
-DROP FUNCTION pg_freespace(regclass, bigint);
-DROP FUNCTION pg_freespace(regclass);