devel/gwenhywfar*: Fix overly aggressive pkg-plist substitutions

6 files changed, 147 insertions, 148 deletions

diff --git a/devel/gwenhywfar-fox16/pkg-plist b/devel/gwenhywfar-fox16/pkg-plist
index 70a9f126907e..5d092c7b2aef 100644
--- a/devel/gwenhywfar-fox16/pkg-plist
+++ b/devel/gwenhywfar-fox16/pkg-plist
@@ -6,5 +6,5 @@ include/gwenhywfar5/gwen-gui-fox16/fox16_htmltext.hpp
 include/gwenhywfar5/gwen-gui-fox16/theme.h
 lib/libgwengui-fox16.so
 lib/libgwengui-fox16.so.%%GWEN_SHLIB_VER%%
-lib/libgwengui-fox16.so.%%GWEN_SHLIB_VER%%.%%GWEN_MINOR_VER%%.%%GWEN_PATCH_VER%%
+lib/libgwengui-fox16.so.%%GWEN_SHLIB_VER%%.%%GWEN_MIN_PATCH_VER%%
 libdata/pkgconfig/gwengui-fox16.pc
diff --git a/devel/gwenhywfar-gtk2/pkg-plist b/devel/gwenhywfar-gtk2/pkg-plist
index 00c3a52169db..e15443b899b6 100644
--- a/devel/gwenhywfar-gtk2/pkg-plist
+++ b/devel/gwenhywfar-gtk2/pkg-plist
@@ -1,5 +1,5 @@
 include/gwenhywfar5/gwen-gui-gtk2/gtk2_gui.h
 lib/libgwengui-gtk2.so
 lib/libgwengui-gtk2.so.%%GWEN_SHLIB_VER%%
-lib/libgwengui-gtk2.so.%%GWEN_SHLIB_VER%%.%%GWEN_MINOR_VER%%.%%GWEN_PATCH_VER%%
+lib/libgwengui-gtk2.so.%%GWEN_SHLIB_VER%%.%%GWEN_MIN_PATCH_VER%%
 libdata/pkgconfig/gwengui-gtk2.pc
diff --git a/devel/gwenhywfar-gtk3/pkg-plist b/devel/gwenhywfar-gtk3/pkg-plist
index 47617c39327b..78af5c8d9799 100644
--- a/devel/gwenhywfar-gtk3/pkg-plist
+++ b/devel/gwenhywfar-gtk3/pkg-plist
@@ -1,5 +1,5 @@
 include/gwenhywfar5/gwen-gui-gtk3/gtk3_gui.h
 lib/libgwengui-gtk3.so
 lib/libgwengui-gtk3.so.%%GWEN_SHLIB_VER%%
-lib/libgwengui-gtk3.so.%%GWEN_SHLIB_VER%%.%%GWEN_MINOR_VER%%.%%GWEN_PATCH_VER%%
+lib/libgwengui-gtk3.so.%%GWEN_SHLIB_VER%%.%%GWEN_MIN_PATCH_VER%%
 libdata/pkgconfig/gwengui-gtk3.pc
diff --git a/devel/gwenhywfar-qt5/pkg-plist b/devel/gwenhywfar-qt5/pkg-plist
index be353be5e5b2..8778439da5f8 100644
--- a/devel/gwenhywfar-qt5/pkg-plist
+++ b/devel/gwenhywfar-qt5/pkg-plist
@@ -1,9 +1,9 @@
 include/gwenhywfar5/gwen-gui-qt5/qt5_gui.hpp
 include/gwenhywfar5/gwen-gui-qt5/qt5_gui_dialog.hpp
 include/gwenhywfar5/gwen-gui-qt5/qt5dialogbox.hpp
-lib/cmake/gwengui-qt5-%%GWEN_MAJOR_VER%%.%%GWEN_MINOR_VER%%/gwengui-qt5-config-version.cmake
-lib/cmake/gwengui-qt5-%%GWEN_MAJOR_VER%%.%%GWEN_MINOR_VER%%/gwengui-qt5-config.cmake
+lib/cmake/gwengui-qt5-%%GWEN_MAJ_MIN_VER%%/gwengui-qt5-config-version.cmake
+lib/cmake/gwengui-qt5-%%GWEN_MAJ_MIN_VER%%/gwengui-qt5-config.cmake
 lib/libgwengui-qt5.so
 lib/libgwengui-qt5.so.%%GWEN_SHLIB_VER%%
-lib/libgwengui-qt5.so.%%GWEN_SHLIB_VER%%.%%GWEN_MINOR_VER%%.%%GWEN_PATCH_VER%%
+lib/libgwengui-qt5.so.%%GWEN_SHLIB_VER%%.%%GWEN_MIN_PATCH_VER%%
 libdata/pkgconfig/gwengui-qt5.pc
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index bba3e6687295..1baf858b330b 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -26,9 +26,8 @@ USE_LDCONFIG=	yes
 
 GWEN_SHLIB_VER=	79
 PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}" \
-		GWEN_MAJOR_VER="${PORTVERSION:R:R}" \
-		GWEN_MINOR_VER="${PORTVERSION:R:E}" \
-		GWEN_PATCH_VER="${PORTVERSION:E}"
+		GWEN_MAJ_MIN_VER="${PORTVERSION:R}" \
+		GWEN_MIN_PATCH_VER="${PORTVERSION:R:E}.${PORTVERSION:E}"
 
 .if !defined(SLAVEPORT)
 OPTIONS_DEFINE=			DOXYGEN LIBXML2 MEMDEBUG OPENSSL
diff --git a/devel/gwenhywfar/pkg-plist b/devel/gwenhywfar/pkg-plist
index aaa792d2d88f..67cf7d130cc7 100644
--- a/devel/gwenhywfar/pkg-plist
+++ b/devel/gwenhywfar/pkg-plist
@@ -6,143 +6,143 @@ bin/mklistdoc
 bin/typemaker
 bin/typemaker2
 bin/xmlmerge
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwen-gui-cpp/api.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwen-gui-cpp/cppdialog.hpp
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwen-gui-cpp/cppgui.hpp
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwen-gui-cpp/cppwidget.hpp
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/args.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/base64.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/bindata.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/buffer.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cgui.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/configmgr.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/configmgr_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptalgo.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptdefs.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/crypthead.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptkey.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptkey_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptkeyrsa.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptkeysym.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptmgr.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptmgr_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/cryptmgrkeys.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ct.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ct_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ct_context.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ct_keyinfo.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ctf_context_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ctfile_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ctplugin.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ctplugin_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/db.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/dbio.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/dbio_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/debug.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/dialog.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/dialog_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/directory.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/endianfns.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/error.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/fastbuffer.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/fslock.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gui.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gui_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwen_sar_fileheader.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwendate.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwenhywfar.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwenhywfarapi.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwensemaphore.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwensignal.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwenthread.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/gwentime.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/hashalgo.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/htmlctx_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/htmlfont_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/htmlimage_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/htmlobject_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/htmlprops_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/httpsession.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/i18n.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/idlist64.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/idmap.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/inetaddr.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/inetsocket.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/inherit.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/libloader.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/list.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/list1.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/list1.tmpl
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/list2.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/list2.tmpl
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/logger.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/mdigest.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/mdigest_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/memcache.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/memory.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/misc.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/misc2.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/msgengine.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/multicache.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/mutex.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/nogui.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/o_image_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/padd.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/paddalgo.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/param.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/param_fns.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/passwdstore.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/path.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/pathmanager.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/plugin.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/plugindescr.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/process.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/refptr.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ringbuffer.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/sar.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/sighead.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/sigtail.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/simpleptrlist.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/smalltresor.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ssl_cert_descr.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/ssl_cert_flags.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/stringlist.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/stringlist2.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio_buffered.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio_file.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio_http.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio_memory.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio_socket.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/syncio_tls.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/system.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/tag16.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/testframework.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/testmodule.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/text.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/threadlocaldata.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/tlv.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/tree.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/tree2.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/types.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/url.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/urlfns.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/version.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/widget_be.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xml.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xml2db.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlcmd.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlcmd_gxml.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlcmd_gxml_fromdb.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlcmd_gxml_todb.h
-%%LIBXML2%%include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlcmd_lxml.h
-%%LIBXML2%%include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlcmd_lxml_todb.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xmlctx.h
-include/gwenhywfar%%GWEN_MAJOR_VER%%/gwenhywfar/xsdnode.h
-lib/cmake/gwengui-cpp-%%GWEN_MAJOR_VER%%.%%GWEN_MINOR_VER%%/gwengui-cpp-config-version.cmake
-lib/cmake/gwengui-cpp-%%GWEN_MAJOR_VER%%.%%GWEN_MINOR_VER%%/gwengui-cpp-config.cmake
-lib/cmake/gwenhywfar-%%GWEN_MAJOR_VER%%.%%GWEN_MINOR_VER%%/gwenhywfar-config-version.cmake
-lib/cmake/gwenhywfar-%%GWEN_MAJOR_VER%%.%%GWEN_MINOR_VER%%/gwenhywfar-config.cmake
+include/gwenhywfar5/gwen-gui-cpp/api.h
+include/gwenhywfar5/gwen-gui-cpp/cppdialog.hpp
+include/gwenhywfar5/gwen-gui-cpp/cppgui.hpp
+include/gwenhywfar5/gwen-gui-cpp/cppwidget.hpp
+include/gwenhywfar5/gwenhywfar/args.h
+include/gwenhywfar5/gwenhywfar/base64.h
+include/gwenhywfar5/gwenhywfar/bindata.h
+include/gwenhywfar5/gwenhywfar/buffer.h
+include/gwenhywfar5/gwenhywfar/cgui.h
+include/gwenhywfar5/gwenhywfar/configmgr.h
+include/gwenhywfar5/gwenhywfar/configmgr_be.h
+include/gwenhywfar5/gwenhywfar/cryptalgo.h
+include/gwenhywfar5/gwenhywfar/cryptdefs.h
+include/gwenhywfar5/gwenhywfar/crypthead.h
+include/gwenhywfar5/gwenhywfar/cryptkey.h
+include/gwenhywfar5/gwenhywfar/cryptkey_be.h
+include/gwenhywfar5/gwenhywfar/cryptkeyrsa.h
+include/gwenhywfar5/gwenhywfar/cryptkeysym.h
+include/gwenhywfar5/gwenhywfar/cryptmgr.h
+include/gwenhywfar5/gwenhywfar/cryptmgr_be.h
+include/gwenhywfar5/gwenhywfar/cryptmgrkeys.h
+include/gwenhywfar5/gwenhywfar/ct.h
+include/gwenhywfar5/gwenhywfar/ct_be.h
+include/gwenhywfar5/gwenhywfar/ct_context.h
+include/gwenhywfar5/gwenhywfar/ct_keyinfo.h
+include/gwenhywfar5/gwenhywfar/ctf_context_be.h
+include/gwenhywfar5/gwenhywfar/ctfile_be.h
+include/gwenhywfar5/gwenhywfar/ctplugin.h
+include/gwenhywfar5/gwenhywfar/ctplugin_be.h
+include/gwenhywfar5/gwenhywfar/db.h
+include/gwenhywfar5/gwenhywfar/dbio.h
+include/gwenhywfar5/gwenhywfar/dbio_be.h
+include/gwenhywfar5/gwenhywfar/debug.h
+include/gwenhywfar5/gwenhywfar/dialog.h
+include/gwenhywfar5/gwenhywfar/dialog_be.h
+include/gwenhywfar5/gwenhywfar/directory.h
+include/gwenhywfar5/gwenhywfar/endianfns.h
+include/gwenhywfar5/gwenhywfar/error.h
+include/gwenhywfar5/gwenhywfar/fastbuffer.h
+include/gwenhywfar5/gwenhywfar/fslock.h
+include/gwenhywfar5/gwenhywfar/gui.h
+include/gwenhywfar5/gwenhywfar/gui_be.h
+include/gwenhywfar5/gwenhywfar/gwen_sar_fileheader.h
+include/gwenhywfar5/gwenhywfar/gwendate.h
+include/gwenhywfar5/gwenhywfar/gwenhywfar.h
+include/gwenhywfar5/gwenhywfar/gwenhywfarapi.h
+include/gwenhywfar5/gwenhywfar/gwensemaphore.h
+include/gwenhywfar5/gwenhywfar/gwensignal.h
+include/gwenhywfar5/gwenhywfar/gwenthread.h
+include/gwenhywfar5/gwenhywfar/gwentime.h
+include/gwenhywfar5/gwenhywfar/hashalgo.h
+include/gwenhywfar5/gwenhywfar/htmlctx_be.h
+include/gwenhywfar5/gwenhywfar/htmlfont_be.h
+include/gwenhywfar5/gwenhywfar/htmlimage_be.h
+include/gwenhywfar5/gwenhywfar/htmlobject_be.h
+include/gwenhywfar5/gwenhywfar/htmlprops_be.h
+include/gwenhywfar5/gwenhywfar/httpsession.h
+include/gwenhywfar5/gwenhywfar/i18n.h
+include/gwenhywfar5/gwenhywfar/idlist64.h
+include/gwenhywfar5/gwenhywfar/idmap.h
+include/gwenhywfar5/gwenhywfar/inetaddr.h
+include/gwenhywfar5/gwenhywfar/inetsocket.h
+include/gwenhywfar5/gwenhywfar/inherit.h
+include/gwenhywfar5/gwenhywfar/libloader.h
+include/gwenhywfar5/gwenhywfar/list.h
+include/gwenhywfar5/gwenhywfar/list1.h
+include/gwenhywfar5/gwenhywfar/list1.tmpl
+include/gwenhywfar5/gwenhywfar/list2.h
+include/gwenhywfar5/gwenhywfar/list2.tmpl
+include/gwenhywfar5/gwenhywfar/logger.h
+include/gwenhywfar5/gwenhywfar/mdigest.h
+include/gwenhywfar5/gwenhywfar/mdigest_be.h
+include/gwenhywfar5/gwenhywfar/memcache.h
+include/gwenhywfar5/gwenhywfar/memory.h
+include/gwenhywfar5/gwenhywfar/misc.h
+include/gwenhywfar5/gwenhywfar/misc2.h
+include/gwenhywfar5/gwenhywfar/msgengine.h
+include/gwenhywfar5/gwenhywfar/multicache.h
+include/gwenhywfar5/gwenhywfar/mutex.h
+include/gwenhywfar5/gwenhywfar/nogui.h
+include/gwenhywfar5/gwenhywfar/o_image_be.h
+include/gwenhywfar5/gwenhywfar/padd.h
+include/gwenhywfar5/gwenhywfar/paddalgo.h
+include/gwenhywfar5/gwenhywfar/param.h
+include/gwenhywfar5/gwenhywfar/param_fns.h
+include/gwenhywfar5/gwenhywfar/passwdstore.h
+include/gwenhywfar5/gwenhywfar/path.h
+include/gwenhywfar5/gwenhywfar/pathmanager.h
+include/gwenhywfar5/gwenhywfar/plugin.h
+include/gwenhywfar5/gwenhywfar/plugindescr.h
+include/gwenhywfar5/gwenhywfar/process.h
+include/gwenhywfar5/gwenhywfar/refptr.h
+include/gwenhywfar5/gwenhywfar/ringbuffer.h
+include/gwenhywfar5/gwenhywfar/sar.h
+include/gwenhywfar5/gwenhywfar/sighead.h
+include/gwenhywfar5/gwenhywfar/sigtail.h
+include/gwenhywfar5/gwenhywfar/simpleptrlist.h
+include/gwenhywfar5/gwenhywfar/smalltresor.h
+include/gwenhywfar5/gwenhywfar/ssl_cert_descr.h
+include/gwenhywfar5/gwenhywfar/ssl_cert_flags.h
+include/gwenhywfar5/gwenhywfar/stringlist.h
+include/gwenhywfar5/gwenhywfar/stringlist2.h
+include/gwenhywfar5/gwenhywfar/syncio.h
+include/gwenhywfar5/gwenhywfar/syncio_buffered.h
+include/gwenhywfar5/gwenhywfar/syncio_file.h
+include/gwenhywfar5/gwenhywfar/syncio_http.h
+include/gwenhywfar5/gwenhywfar/syncio_memory.h
+include/gwenhywfar5/gwenhywfar/syncio_socket.h
+include/gwenhywfar5/gwenhywfar/syncio_tls.h
+include/gwenhywfar5/gwenhywfar/system.h
+include/gwenhywfar5/gwenhywfar/tag16.h
+include/gwenhywfar5/gwenhywfar/testframework.h
+include/gwenhywfar5/gwenhywfar/testmodule.h
+include/gwenhywfar5/gwenhywfar/text.h
+include/gwenhywfar5/gwenhywfar/threadlocaldata.h
+include/gwenhywfar5/gwenhywfar/tlv.h
+include/gwenhywfar5/gwenhywfar/tree.h
+include/gwenhywfar5/gwenhywfar/tree2.h
+include/gwenhywfar5/gwenhywfar/types.h
+include/gwenhywfar5/gwenhywfar/url.h
+include/gwenhywfar5/gwenhywfar/urlfns.h
+include/gwenhywfar5/gwenhywfar/version.h
+include/gwenhywfar5/gwenhywfar/widget_be.h
+include/gwenhywfar5/gwenhywfar/xml.h
+include/gwenhywfar5/gwenhywfar/xml2db.h
+include/gwenhywfar5/gwenhywfar/xmlcmd.h
+include/gwenhywfar5/gwenhywfar/xmlcmd_gxml.h
+include/gwenhywfar5/gwenhywfar/xmlcmd_gxml_fromdb.h
+include/gwenhywfar5/gwenhywfar/xmlcmd_gxml_todb.h
+%%LIBXML2%%include/gwenhywfar5/gwenhywfar/xmlcmd_lxml.h
+%%LIBXML2%%include/gwenhywfar5/gwenhywfar/xmlcmd_lxml_todb.h
+include/gwenhywfar5/gwenhywfar/xmlctx.h
+include/gwenhywfar5/gwenhywfar/xsdnode.h
+lib/cmake/gwengui-cpp-%%GWEN_MAJ_MIN_VER%%/gwengui-cpp-config-version.cmake
+lib/cmake/gwengui-cpp-%%GWEN_MAJ_MIN_VER%%/gwengui-cpp-config.cmake
+lib/cmake/gwenhywfar-%%GWEN_MAJ_MIN_VER%%/gwenhywfar-config-version.cmake
+lib/cmake/gwenhywfar-%%GWEN_MAJ_MIN_VER%%/gwenhywfar-config.cmake
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/configmgr/dir.so
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/configmgr/dir.xml
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/ct/ohbci.so
@@ -161,10 +161,10 @@ lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.so.0.0.1
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.xml
 lib/libgwengui-cpp.so
 lib/libgwengui-cpp.so.%%GWEN_SHLIB_VER%%
-lib/libgwengui-cpp.so.%%GWEN_SHLIB_VER%%.%%GWEN_MINOR_VER%%.%%GWEN_PATCH_VER%%
+lib/libgwengui-cpp.so.%%GWEN_SHLIB_VER%%.%%GWEN_MIN_PATCH_VER%%
 lib/libgwenhywfar.so
 lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%
-lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.%%GWEN_MINOR_VER%%.%%GWEN_PATCH_VER%%
+lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.%%GWEN_MIN_PATCH_VER%%
 libdata/pkgconfig/gwenhywfar.pc
 share/aclocal/gwenhywfar.m4
 share/gwenbuild/templates/convlib.tmpl