Fix plist and chase x11/gnomelibs.

Submitted by:	SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>

2 files changed, 6 insertions, 425 deletions

diff --git a/japanese/gnomelibs/Makefile b/japanese/gnomelibs/Makefile
index 232efa73af36..18f72b801aa8 100644
--- a/japanese/gnomelibs/Makefile
+++ b/japanese/gnomelibs/Makefile
@@ -6,7 +6,7 @@
 #
 
 # This port does not work with another version of master port.
-#PORTVERSION=	1.2.13
+#PORTVERSION=	1.4.1.1
 CATEGORIES=	japanese x11 gnome
 
 MASTERDIR=	${.CURDIR}/../../x11/gnomelibs
@@ -15,7 +15,11 @@ EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 MAINTAINER=	nakai@FreeBSD.org
 
-PLIST=		${.CURDIR}/pkg-plist
+PLIST=		${WRKDIR}/pkg-plist
+
+post-extract:
+	${ECHO} bin/gnome-libs-jp > ${PLIST}
+	${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST}
 
 post-install:
 	${TOUCH} ${PREFIX}/bin/gnome-libs-jp
diff --git a/japanese/gnomelibs/pkg-plist b/japanese/gnomelibs/pkg-plist
deleted file mode 100644
index 303dc744951f..000000000000
--- a/japanese/gnomelibs/pkg-plist
+++ /dev/null
@@ -1,423 +0,0 @@
-bin/dns-helper
-bin/gconfigger
-bin/gnome-bug
-bin/gnome-config
-bin/gnome-dump-metadata
-bin/gnome-gen-mimedb
-bin/gnome-libs-jp
-bin/gnome-moz-remote
-bin/gnome-name-service
-bin/gnome-pty-helper
-bin/gnome_segv
-bin/goad-browser
-bin/libart-config
-bin/loadshlib
-bin/new-object
-etc/gnomeConf.sh
-etc/libartConf.sh
-etc/mime-magic
-etc/mime-magic.dat
-etc/paper.config
-etc/sound/events/gnome.soundlist
-etc/sound/events/gtk-events.soundlist
-include/gnome.h
-include/gnomesupport.h
-include/gtk-xmhtml/HTML.h
-include/gtk-xmhtml/XmHTML.h
-include/gtk-xmhtml/XmHTMLI.h
-include/gtk-xmhtml/XmHTMLP.h
-include/gtk-xmhtml/gtk-xmhtml-p.h
-include/gtk-xmhtml/gtk-xmhtml.h
-include/gtk-xmhtml/miniparse.h
-include/gtk-xmhtml/toolkit.h
-include/libart_lgpl/art_affine.h
-include/libart_lgpl/art_alphagamma.h
-include/libart_lgpl/art_bpath.h
-include/libart_lgpl/art_config.h
-include/libart_lgpl/art_filterlevel.h
-include/libart_lgpl/art_gray_svp.h
-include/libart_lgpl/art_misc.h
-include/libart_lgpl/art_pathcode.h
-include/libart_lgpl/art_pixbuf.h
-include/libart_lgpl/art_point.h
-include/libart_lgpl/art_rect.h
-include/libart_lgpl/art_rect_svp.h
-include/libart_lgpl/art_rect_uta.h
-include/libart_lgpl/art_rgb.h
-include/libart_lgpl/art_rgb_affine.h
-include/libart_lgpl/art_rgb_bitmap_affine.h
-include/libart_lgpl/art_rgb_pixbuf_affine.h
-include/libart_lgpl/art_rgb_rgba_affine.h
-include/libart_lgpl/art_rgb_svp.h
-include/libart_lgpl/art_svp.h
-include/libart_lgpl/art_svp_ops.h
-include/libart_lgpl/art_svp_point.h
-include/libart_lgpl/art_svp_render_aa.h
-include/libart_lgpl/art_svp_vpath.h
-include/libart_lgpl/art_svp_vpath_stroke.h
-include/libart_lgpl/art_svp_wind.h
-include/libart_lgpl/art_uta.h
-include/libart_lgpl/art_uta_ops.h
-include/libart_lgpl/art_uta_rect.h
-include/libart_lgpl/art_uta_svp.h
-include/libart_lgpl/art_uta_vpath.h
-include/libart_lgpl/art_vpath.h
-include/libart_lgpl/art_vpath_bpath.h
-include/libart_lgpl/art_vpath_dash.h
-include/libart_lgpl/art_vpath_svp.h
-include/libart_lgpl/libart-features.h
-include/libart_lgpl/libart.h
-include/libgnome/gnome-config.h
-include/libgnome/gnome-defs.h
-include/libgnome/gnome-dentry.h
-include/libgnome/gnome-exec.h
-include/libgnome/gnome-fileconvert.h
-include/libgnome/gnome-help.h
-include/libgnome/gnome-history.h
-include/libgnome/gnome-i18n.h
-include/libgnome/gnome-magic.h
-include/libgnome/gnome-metadata.h
-include/libgnome/gnome-mime-info.h
-include/libgnome/gnome-mime.h
-include/libgnome/gnome-paper.h
-include/libgnome/gnome-popt.h
-include/libgnome/gnome-regex.h
-include/libgnome/gnome-remote.h
-include/libgnome/gnome-score.h
-include/libgnome/gnome-sound.h
-include/libgnome/gnome-triggers.h
-include/libgnome/gnome-url.h
-include/libgnome/gnome-util.h
-include/libgnome/libgnome.h
-include/libgnomeui/gnome-about.h
-include/libgnomeui/gnome-animator.h
-include/libgnomeui/gnome-app-helper.h
-include/libgnomeui/gnome-app-util.h
-include/libgnomeui/gnome-app.h
-include/libgnomeui/gnome-appbar.h
-include/libgnomeui/gnome-calculator.h
-include/libgnomeui/gnome-canvas-image.h
-include/libgnomeui/gnome-canvas-line.h
-include/libgnomeui/gnome-canvas-load.h
-include/libgnomeui/gnome-canvas-polygon.h
-include/libgnomeui/gnome-canvas-rect-ellipse.h
-include/libgnomeui/gnome-canvas-text.h
-include/libgnomeui/gnome-canvas-util.h
-include/libgnomeui/gnome-canvas-widget.h
-include/libgnomeui/gnome-canvas.h
-include/libgnomeui/gnome-client.h
-include/libgnomeui/gnome-color-picker.h
-include/libgnomeui/gnome-compat.h
-include/libgnomeui/gnome-dateedit.h
-include/libgnomeui/gnome-dentry-edit.h
-include/libgnomeui/gnome-dialog-util.h
-include/libgnomeui/gnome-dialog.h
-include/libgnomeui/gnome-dns.h
-include/libgnomeui/gnome-dock-band.h
-include/libgnomeui/gnome-dock-item.h
-include/libgnomeui/gnome-dock-layout.h
-include/libgnomeui/gnome-dock.h
-include/libgnomeui/gnome-druid-page-finish.h
-include/libgnomeui/gnome-druid-page-standard.h
-include/libgnomeui/gnome-druid-page-start.h
-include/libgnomeui/gnome-druid-page.h
-include/libgnomeui/gnome-druid.h
-include/libgnomeui/gnome-entry.h
-include/libgnomeui/gnome-file-entry.h
-include/libgnomeui/gnome-font-picker.h
-include/libgnomeui/gnome-font-selector.h
-include/libgnomeui/gnome-geometry.h
-include/libgnomeui/gnome-guru.h
-include/libgnomeui/gnome-href.h
-include/libgnomeui/gnome-ice.h
-include/libgnomeui/gnome-icon-entry.h
-include/libgnomeui/gnome-icon-item.h
-include/libgnomeui/gnome-icon-list.h
-include/libgnomeui/gnome-icon-sel.h
-include/libgnomeui/gnome-icon-text.h
-include/libgnomeui/gnome-init.h
-include/libgnomeui/gnome-less.h
-include/libgnomeui/gnome-mdi-child.h
-include/libgnomeui/gnome-mdi-generic-child.h
-include/libgnomeui/gnome-mdi-session.h
-include/libgnomeui/gnome-mdi.h
-include/libgnomeui/gnome-messagebox.h
-include/libgnomeui/gnome-number-entry.h
-include/libgnomeui/gnome-paper-selector.h
-include/libgnomeui/gnome-pixmap-entry.h
-include/libgnomeui/gnome-pixmap.h
-include/libgnomeui/gnome-popup-help.h
-include/libgnomeui/gnome-popup-menu.h
-include/libgnomeui/gnome-preferences.h
-include/libgnomeui/gnome-procbar.h
-include/libgnomeui/gnome-properties.h
-include/libgnomeui/gnome-property-entries.h
-include/libgnomeui/gnome-propertybox.h
-include/libgnomeui/gnome-scores.h
-include/libgnomeui/gnome-spell.h
-include/libgnomeui/gnome-startup.h
-include/libgnomeui/gnome-stock.h
-include/libgnomeui/gnome-types.h
-include/libgnomeui/gnome-uidefs.h
-include/libgnomeui/gnome-window-icon.h
-include/libgnomeui/gnome-window.h
-include/libgnomeui/gnome-winhints.h
-include/libgnomeui/gnometypebuiltins.h
-include/libgnomeui/gtk-clock.h
-include/libgnomeui/gtk-ted.h
-include/libgnomeui/gtkcauldron.h
-include/libgnomeui/gtkdial.h
-include/libgnomeui/gtkpixmapmenuitem.h
-include/libgnomeui/libgnomeui.h
-include/libgnorba/Table.h
-include/libgnorba/gnome-factory.h
-include/libgnorba/gnome-unknown.h
-include/libgnorba/gnorba.h
-include/popt-gnome.h
-include/zvt/lists.h
-include/zvt/vt.h
-include/zvt/vtx.h
-include/zvt/zvtterm.h
-lib/libart_lgpl.a
-lib/libart_lgpl.so
-lib/libart_lgpl.so.5
-lib/libgnome.a
-lib/libgnome.so
-lib/libgnome.so.5
-lib/libgnomesupport.a
-lib/libgnomesupport.so
-lib/libgnomesupport.so.5
-lib/libgnomeui.a
-lib/libgnomeui.so
-lib/libgnomeui.so.5
-lib/libgnorba.a
-lib/libgnorba.so
-lib/libgnorba.so.5
-lib/libgnorbagtk.a
-lib/libgnorbagtk.so
-lib/libgnorbagtk.so.5
-lib/libgtkxmhtml.a
-lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.5
-lib/libzvt.a
-lib/libzvt.so
-lib/libzvt.so.5
-share/aclocal/libart.m4
-share/gnome/gtkrc
-share/gnome/gtkrc.el
-share/gnome/gtkrc.eo
-share/gnome/gtkrc.he
-share/gnome/gtkrc.hy
-share/gnome/gtkrc.iso88592
-share/gnome/gtkrc.iso88595
-share/gnome/gtkrc.ja
-share/gnome/gtkrc.ka_GE.georgianacademy
-share/gnome/gtkrc.ka_GE.georgianps
-share/gnome/gtkrc.ko
-share/gnome/gtkrc.ru
-share/gnome/gtkrc.th
-share/gnome/gtkrc.tr
-share/gnome/gtkrc.uk
-share/gnome/gtkrc.vi_VN.tcvn
-share/gnome/gtkrc.vi_VN.viscii
-share/gnome/gtkrc.zh_CN
-share/gnome/gtkrc.zh_TW.Big5
-share/gnome/doc/gnome-doc
-share/gnome/doc/gnome-doc.el
-share/gnome/doc/mkstub
-share/gnome/html/gnome-decl.txt
-share/gnome/html/gnome-sections.txt
-share/gnome/html/gnome.html
-share/gnome/html/gnome/book1.html
-share/gnome/html/gnome/gnome-gnome-config.html
-share/gnome/html/gnome/gnome-gnome-defs.html
-share/gnome/html/gnome/gnome-gnome-dentry.html
-share/gnome/html/gnome/gnome-gnome-exec.html
-share/gnome/html/gnome/gnome-gnome-fileconvert.html
-share/gnome/html/gnome/gnome-gnome-help.html
-share/gnome/html/gnome/gnome-gnome-history.html
-share/gnome/html/gnome/gnome-gnome-i18n.html
-share/gnome/html/gnome/gnome-gnome-metadata.html
-share/gnome/html/gnome/gnome-gnome-mime-info.html
-share/gnome/html/gnome/gnome-gnome-mime.html
-share/gnome/html/gnome/gnome-gnome-paper.html
-share/gnome/html/gnome/gnome-gnome-popt.html
-share/gnome/html/gnome/gnome-gnome-regex.html
-share/gnome/html/gnome/gnome-gnome-remote.html
-share/gnome/html/gnome/gnome-gnome-score.html
-share/gnome/html/gnome/gnome-gnome-sound.html
-share/gnome/html/gnome/gnome-gnome-triggers.html
-share/gnome/html/gnome/gnome-gnome-url.html
-share/gnome/html/gnome/gnome-gnome-util.html
-share/gnome/html/gnome/gnome-libgnome.html
-share/gnome/html/gnome/libgnome.html
-share/gnome/html/gnomeui-decl.txt
-share/gnome/html/gnomeui-sections.txt
-share/gnome/html/gnomeui.hierarchy
-share/gnome/html/gnomeui.html
-share/gnome/html/gnomeui.types
-share/gnome/html/gnomeui/book1.html
-share/gnome/html/gnomeui/gnome-objects.html
-share/gnome/html/gnomeui/gnomeabout.html
-share/gnome/html/gnomeui/gnomeanimator.html
-share/gnome/html/gnomeui/gnomeapp.html
-share/gnome/html/gnomeui/gnomeappbar.html
-share/gnome/html/gnomeui/gnomecalculator.html
-share/gnome/html/gnomeui/gnomecanvas.html
-share/gnome/html/gnomeui/gnomecanvasellipse.html
-share/gnome/html/gnomeui/gnomecanvasgroup.html
-share/gnome/html/gnomeui/gnomecanvasimage.html
-share/gnome/html/gnomeui/gnomecanvasitem.html
-share/gnome/html/gnomeui/gnomecanvasline.html
-share/gnome/html/gnomeui/gnomecanvaspolygon.html
-share/gnome/html/gnomeui/gnomecanvasre.html
-share/gnome/html/gnomeui/gnomecanvasrect.html
-share/gnome/html/gnomeui/gnomecanvastext.html
-share/gnome/html/gnomeui/gnomecanvaswidget.html
-share/gnome/html/gnomeui/gnomeclient.html
-share/gnome/html/gnomeui/gnomecolorpicker.html
-share/gnome/html/gnomeui/gnomedateedit.html
-share/gnome/html/gnomeui/gnomedentryedit.html
-share/gnome/html/gnomeui/gnomedialog.html
-share/gnome/html/gnomeui/gnomedock.html
-share/gnome/html/gnomeui/gnomedockband.html
-share/gnome/html/gnomeui/gnomedockitem.html
-share/gnome/html/gnomeui/gnomedocklayout.html
-share/gnome/html/gnomeui/gnomedruid.html
-share/gnome/html/gnomeui/gnomedruidpage.html
-share/gnome/html/gnomeui/gnomedruidpagefinish.html
-share/gnome/html/gnomeui/gnomedruidpagestandard.html
-share/gnome/html/gnomeui/gnomedruidpagestart.html
-share/gnome/html/gnomeui/gnomeentry.html
-share/gnome/html/gnomeui/gnomefileentry.html
-share/gnome/html/gnomeui/gnomefontpicker.html
-share/gnome/html/gnomeui/gnomefontselector.html
-share/gnome/html/gnomeui/gnomehref.html
-share/gnome/html/gnomeui/gnomeiconentry.html
-share/gnome/html/gnomeui/gnomeiconlist.html
-share/gnome/html/gnomeui/gnomeiconselection.html
-share/gnome/html/gnomeui/gnomeicontextitem.html
-share/gnome/html/gnomeui/gnomeless.html
-share/gnome/html/gnomeui/gnomemdi.html
-share/gnome/html/gnomeui/gnomemdichild.html
-share/gnome/html/gnomeui/gnomemdigenericchild.html
-share/gnome/html/gnomeui/gnomemessagebox.html
-share/gnome/html/gnomeui/gnomenumberentry.html
-share/gnome/html/gnomeui/gnomepaperselector.html
-share/gnome/html/gnomeui/gnomepixmap.html
-share/gnome/html/gnomeui/gnomepixmapentry.html
-share/gnome/html/gnomeui/gnomeprocbar.html
-share/gnome/html/gnomeui/gnomepropertybox.html
-share/gnome/html/gnomeui/gnomescores.html
-share/gnome/html/gnomeui/gnomespell.html
-share/gnome/html/gnomeui/gnomestock.html
-share/gnome/html/gnomeui/gnomeui-gnome-app-helper.html
-share/gnome/html/gnomeui/gnomeui-gnome-app-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-canvas-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-dialog-util.html
-share/gnome/html/gnomeui/gnomeui-gnome-dns.html
-share/gnome/html/gnomeui/gnomeui-gnome-geometry.html
-share/gnome/html/gnomeui/gnomeui-gnome-ice.html
-share/gnome/html/gnomeui/gnomeui-gnome-icon-text.html
-share/gnome/html/gnomeui/gnomeui-gnome-init.html
-share/gnome/html/gnomeui/gnomeui-gnome-mdi-session.html
-share/gnome/html/gnomeui/gnomeui-gnome-popup-help.html
-share/gnome/html/gnomeui/gnomeui-gnome-popup-menu.html
-share/gnome/html/gnomeui/gnomeui-gnome-preferences.html
-share/gnome/html/gnomeui/gnomeui-gnome-properties.html
-share/gnome/html/gnomeui/gnomeui-gnome-property-entries.html
-share/gnome/html/gnomeui/gnomeui-gnome-startup.html
-share/gnome/html/gnomeui/gnomeui-gnome-types.html
-share/gnome/html/gnomeui/gnomeui-gnome-uidefs.html
-share/gnome/html/gnomeui/gnomeui-gnome-window-icon.html
-share/gnome/html/gnomeui/gnomeui-gnome-winhints.html
-share/gnome/html/gnomeui/gnomeui-gtkcauldron.html
-share/gnome/html/gnomeui/gtkclock.html
-share/gnome/html/gnomeui/gtkdial.html
-share/gnome/html/gnomeui/gtkpixmapmenuitem.html
-share/gnome/html/gnomeui/gtkted.html
-share/gnome/html/gnomeui/libgnomeui.html
-share/gnome/html/gnorba-decl.txt
-share/gnome/html/gnorba-sections.txt
-share/gnome/idl/GnomeObject.idl
-share/gnome/idl/Table.idl
-share/gnome/idl/desktop-editor.idl
-share/gnome/idl/desktop-textviewer.idl
-share/gnome/idl/gnome-factory.idl
-share/gnome/idl/gnome-unknown.idl
-share/gnome/idl/name-service.idl
-share/gnome/mime-info/gnome.mime
-share/gnome/pixmaps/calculator-font.png
-share/gnome/pixmaps/gnome-default-dlg.png
-share/gnome/pixmaps/gnome-error.png
-share/gnome/pixmaps/gnome-info.png
-share/gnome/pixmaps/gnome-question.png
-share/gnome/pixmaps/gnome-warning.png
-share/gnome/pixmaps/no.xpm
-share/gnome/pixmaps/yes.xpm
-share/gnome/type-convert/gnome-make-postscript-mimes
-share/gnome/type-convert/postscript.convert
-share/gnome/type-convert/type.convert
-share/locale/az/LC_MESSAGES/gnome-libs.mo
-share/locale/ca/LC_MESSAGES/gnome-libs.mo
-share/locale/cs/LC_MESSAGES/gnome-libs.mo
-share/locale/da/LC_MESSAGES/gnome-libs.mo
-share/locale/de/LC_MESSAGES/gnome-libs.mo
-share/locale/el/LC_MESSAGES/gnome-libs.mo
-share/locale/en_GB/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
-share/locale/et/LC_MESSAGES/gnome-libs.mo
-share/locale/eu/LC_MESSAGES/gnome-libs.mo
-share/locale/fi/LC_MESSAGES/gnome-libs.mo
-share/locale/fr/LC_MESSAGES/gnome-libs.mo
-share/locale/ga/LC_MESSAGES/gnome-libs.mo
-share/locale/gl/LC_MESSAGES/gnome-libs.mo
-share/locale/hr/LC_MESSAGES/gnome-libs.mo
-share/locale/hu/LC_MESSAGES/gnome-libs.mo
-share/locale/it/LC_MESSAGES/gnome-libs.mo
-share/locale/ja/LC_MESSAGES/gnome-libs.mo
-share/locale/ko/LC_MESSAGES/gnome-libs.mo
-share/locale/lt/LC_MESSAGES/gnome-libs.mo
-share/locale/nl/LC_MESSAGES/gnome-libs.mo
-share/locale/nn/LC_MESSAGES/gnome-libs.mo
-share/locale/no/LC_MESSAGES/gnome-libs.mo
-share/locale/pl/LC_MESSAGES/gnome-libs.mo
-share/locale/pt/LC_MESSAGES/gnome-libs.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
-share/locale/ro/LC_MESSAGES/gnome-libs.mo
-share/locale/ru/LC_MESSAGES/gnome-libs.mo
-share/locale/sk/LC_MESSAGES/gnome-libs.mo
-share/locale/sl/LC_MESSAGES/gnome-libs.mo
-share/locale/sp/LC_MESSAGES/gnome-libs.mo
-share/locale/sr/LC_MESSAGES/gnome-libs.mo
-share/locale/sv/LC_MESSAGES/gnome-libs.mo
-share/locale/ta/LC_MESSAGES/gnome-libs.mo
-share/locale/tr/LC_MESSAGES/gnome-libs.mo
-share/locale/uk/LC_MESSAGES/gnome-libs.mo
-share/locale/vi/LC_MESSAGES/gnome-libs.mo
-share/locale/wa/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
-@exec mkdir -p %D/share/gnome/games
-@dirrm share/gnome/type-convert
-@dirrm share/gnome/pixmaps
-@dirrm share/gnome/mime-info
-@dirrm share/gnome/idl
-@dirrm share/gnome/html/zvt
-@dirrm share/gnome/html/gnorba
-@dirrm share/gnome/html/gnomeui
-@dirrm share/gnome/html/gnome
-@dirrm share/gnome/html
-@dirrm share/gnome/help/gnome-dev-info/C
-@dirrm share/gnome/help/gnome-dev-info
-@dirrm share/gnome/help
-@dirrm share/gnome/games
-@dirrm share/gnome/doc
-@dirrm include/zvt
-@dirrm include/libgnorba
-@dirrm include/libgnomeui
-@dirrm include/libgnome
-@dirrm include/libart_lgpl
-@dirrm include/gtk-xmhtml
-@dirrm etc/sound/events
-@dirrm etc/sound