From 86632ef8ac793d54f1b9b2048a62c0d7134eaa0d Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Mon, 8 Apr 2013 14:42:16 +0400
Subject: Deprecate *.p5m.x

---
 cibs.p5m.gen          | 43 +++++++++++++++++++++++++++++++++++++++++++
 cibs.p5m.x            | 43 -------------------------------------------
 rules/ips-manifest.mk |  8 ++++++++
 3 files changed, 51 insertions(+), 43 deletions(-)
 create mode 100755 cibs.p5m.gen
 delete mode 100755 cibs.p5m.x

diff --git a/cibs.p5m.gen b/cibs.p5m.gen
new file mode 100755
index 0000000..93ce326
--- /dev/null
+++ b/cibs.p5m.gen
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+cat <<'META'
+set name=pkg.fmri value=pkg:/developer/pkg/cibs@$(ips-version)
+set name=pkg.summary value="Common IPS build system"
+set name=info.upstream-url value="https://github.com/Nexenta/cibs"
+set name=info.source-url value="https://github.com/Nexenta/cibs.git"
+
+license LICENSE license=CDDL
+
+depend fmri=pkg:/developer/build/gnu-make type=require
+
+META
+
+echo '# rules:'
+for r in mogrified/rules/*.mk; do
+    echo "file $r path=\$(cibs-inst-root)/rules/`basename $r`"
+done
+
+echo
+echo '# scripts:'
+for s in scripts/*; do
+    if ! [ -f "$s" ]; then
+        echo "Garbage in scripts: \`$s'" >&2
+        exit 1
+    fi
+    if ! [ -x "$s" ]; then
+        echo "\`$s' is not executable" >&2
+        exit 1
+    fi
+    echo "file $s path=\$(cibs-inst-root)/scripts/`basename $s` mode=0555"
+done
+
+echo
+echo '# transformations:'
+for t in trans/*; do
+    if ! [ -f "$t" ]; then
+        echo "Garbage in trans: \`$t'" >&2
+        exit 1
+    fi
+    echo "file $t path=\$(cibs-inst-root)/trans/`basename $t`"
+done
+
diff --git a/cibs.p5m.x b/cibs.p5m.x
deleted file mode 100755
index 93ce326..0000000
--- a/cibs.p5m.x
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-cat <<'META'
-set name=pkg.fmri value=pkg:/developer/pkg/cibs@$(ips-version)
-set name=pkg.summary value="Common IPS build system"
-set name=info.upstream-url value="https://github.com/Nexenta/cibs"
-set name=info.source-url value="https://github.com/Nexenta/cibs.git"
-
-license LICENSE license=CDDL
-
-depend fmri=pkg:/developer/build/gnu-make type=require
-
-META
-
-echo '# rules:'
-for r in mogrified/rules/*.mk; do
-    echo "file $r path=\$(cibs-inst-root)/rules/`basename $r`"
-done
-
-echo
-echo '# scripts:'
-for s in scripts/*; do
-    if ! [ -f "$s" ]; then
-        echo "Garbage in scripts: \`$s'" >&2
-        exit 1
-    fi
-    if ! [ -x "$s" ]; then
-        echo "\`$s' is not executable" >&2
-        exit 1
-    fi
-    echo "file $s path=\$(cibs-inst-root)/scripts/`basename $s` mode=0555"
-done
-
-echo
-echo '# transformations:'
-for t in trans/*; do
-    if ! [ -f "$t" ]; then
-        echo "Garbage in trans: \`$t'" >&2
-        exit 1
-    fi
-    echo "file $t path=\$(cibs-inst-root)/trans/`basename $t`"
-done
-
diff --git a/rules/ips-manifest.mk b/rules/ips-manifest.mk
index 3bea4be..6774154 100644
--- a/rules/ips-manifest.mk
+++ b/rules/ips-manifest.mk
@@ -75,8 +75,16 @@ $(transdir)/arch \
 # Manifest generators:
 manifests-x := $(wildcard *.p5m.x)
 ifneq (,$(manifests-x))
+$(warning *.p5m.x files are deprecated because of similarity to RPCGEN sources)
 manifests-generated += $(manifests-x:%.x=%)
 endif
+manifests-gen := $(wildcard *.p5m.gen)
+ifneq (,$(manifests-gen))
+manifests-generated += $(manifests-gen:%.gen=%)
+endif
+%.p5m: %.p5m.gen
+	(echo '# This file was generated by "$<"' > "$@" && \
+	env $(env) "./$<" >> "$@") || rm "$@"
 %.p5m: %.p5m.x
 	(echo '# This file was generated by "$<"' > "$@" && \
 	env $(env) "./$<" >> "$@") || rm "$@"
-- 
cgit v1.2.3