From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster
---
components/autogen/autogen.p5m | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/components/autogen/autogen.p5m b/components/autogen/autogen.p5m
index 9a1f45a..29c5aae 100644
--- a/components/autogen/autogen.p5m
+++ b/components/autogen/autogen.p5m
@@ -24,51 +24,78 @@
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/developer/build/autogen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU autogen utility"
set name=pkg.description \
value="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text."
-set name=pkg.summary value="GNU autogen utility"
set name=com.oracle.info.description value="GNU autogen"
-set name=com.oracle.info.tpno value=6148
+set name=com.oracle.info.tpno value=11805
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/315
+set name=org.opensolaris.arc-caseid value=PSARC/2008/315 value=PSARC/2012/367
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/autogen
+file path=usr/bin/$(MACH64)/autoopts-config
+file usr/bin/$(MACH64)/autogen path=usr/bin/autogen
file path=usr/bin/autoopts-config
-file path=usr/bin/columns
-file path=usr/bin/getdefs
-file path=usr/bin/xml2ag
+file usr/bin/$(MACH64)/columns path=usr/bin/columns
+file usr/bin/$(MACH64)/getdefs path=usr/bin/getdefs
+file usr/bin/$(MACH64)/xml2ag path=usr/bin/xml2ag
file path=usr/include/autoopts/options.h
file path=usr/include/autoopts/usage-txt.h
-file path=usr/lib/libguileopts.a
-file path=usr/lib/libguileopts.so.0.0.1
+file path=usr/lib/$(MACH64)/libopts.a
+link path=usr/lib/$(MACH64)/libopts.so target=libopts.so.25.11.5
+link path=usr/lib/$(MACH64)/libopts.so.25 target=libopts.so.25.11.5
+file path=usr/lib/$(MACH64)/libopts.so.25.11.5
file path=usr/lib/libopts.a
-file path=usr/lib/libopts.so.25.3.0
-file path=usr/lib/pkgconfig/autoopts.pc
+link path=usr/lib/libopts.so target=libopts.so.25.11.5
+link path=usr/lib/libopts.so.25 target=libopts.so.25.11.5
+file path=usr/lib/libopts.so.25.11.5
+file usr/share/pkgconfig/autoopts.pc path=usr/lib/pkgconfig/autoopts.pc
file path=usr/share/aclocal/autoopts.m4
-file path=usr/share/aclocal/liboptschk.m4
file path=usr/share/autogen/aginfo.tpl
file path=usr/share/autogen/aginfo3.tpl
-file path=usr/share/autogen/agman-lib.tpl
+file path=usr/share/autogen/agman-cmd.tpl
+file path=usr/share/autogen/agman.tlib
file path=usr/share/autogen/agman1.tpl
file path=usr/share/autogen/agman3.tpl
+file path=usr/share/autogen/agmdoc-cmd.tpl
+file path=usr/share/autogen/agpl.lic
+file path=usr/share/autogen/agtexi-cmd.tpl
file path=usr/share/autogen/autoopts.m4
-file path=usr/share/autogen/confmacs.tpl
+file path=usr/share/autogen/bits.tpl
+file path=usr/share/autogen/cmd-doc.tlib
+file path=usr/share/autogen/confmacs.tlib
file path=usr/share/autogen/conftest.tpl
-file path=usr/share/autogen/fsm-macro.tpl
-file path=usr/share/autogen/fsm-trans.tpl
+file path=usr/share/autogen/def2pot.tpl
+file path=usr/share/autogen/fsm-macro.tlib
+file path=usr/share/autogen/fsm-trans.tlib
file path=usr/share/autogen/fsm.tpl
file path=usr/share/autogen/getopt.tpl
-file path=usr/share/autogen/optcode.tpl
-file path=usr/share/autogen/opthead.tpl
+file path=usr/share/autogen/gpl.lic
+file path=usr/share/autogen/gplv2.lic
+file path=usr/share/autogen/lgpl.lic
+file path=usr/share/autogen/liboptschk.m4
+file path=usr/share/autogen/man2man
+file path=usr/share/autogen/man2mdoc
+file path=usr/share/autogen/man2texi
+file path=usr/share/autogen/mbsd.lic
+file path=usr/share/autogen/mdoc2man
+file path=usr/share/autogen/mdoc2mdoc
+file path=usr/share/autogen/mdoc2texi
+file path=usr/share/autogen/optcode.tlib
+file path=usr/share/autogen/opthead.tlib
file path=usr/share/autogen/options.tpl
-file path=usr/share/autogen/optlib.tpl
-file path=usr/share/autogen/optmain.tpl
+file path=usr/share/autogen/optlib.tlib
+file path=usr/share/autogen/optmain.tlib
file path=usr/share/autogen/rc-sample.tpl
file path=usr/share/autogen/stdoptions.def
+file path=usr/share/autogen/strings.tpl
+file path=usr/share/autogen/texi2man
+file path=usr/share/autogen/texi2mdoc
+file path=usr/share/autogen/texi2texi
+file path=usr/share/autogen/tpl-config.tlib
+file path=usr/share/autogen/usage.tlib
file path=usr/share/info/autogen.info
file path=usr/share/info/autogen.info-1
file path=usr/share/info/autogen.info-2
@@ -98,8 +125,4 @@
file path=usr/share/man/man3/streqvmap.3
file path=usr/share/man/man3/strneqvcmp.3
file path=usr/share/man/man3/strtransform.3
-license autogen.license license="GPLv2, FDLv1.2"
-link path=usr/lib/libguileopts.so target=libguileopts.so.0.0.1
-link path=usr/lib/libguileopts.so.0 target=libguileopts.so.0.0.1
-link path=usr/lib/libopts.so target=libopts.so.25.3.0
-link path=usr/lib/libopts.so.25 target=libopts.so.25.3.0
+license autogen.license license="GPLv3, FDLv1.2"
--
Gitblit v1.9.3