diff options
-rw-r--r-- | japanese/uim/Makefile | 1 | ||||
-rw-r--r-- | japanese/uim/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | japanese/uim/files/patch-configure | 10 | ||||
-rw-r--r-- | japanese/uim/files/patch-helper:Makefile.in | 10 | ||||
-rw-r--r-- | japanese/uim/pkg-plist | 7 | ||||
-rw-r--r-- | textproc/uim/Makefile | 1 | ||||
-rw-r--r-- | textproc/uim/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | textproc/uim/files/patch-configure | 10 | ||||
-rw-r--r-- | textproc/uim/files/patch-helper:Makefile.in | 10 | ||||
-rw-r--r-- | textproc/uim/pkg-plist | 7 |
10 files changed, 60 insertions, 22 deletions
diff --git a/japanese/uim/Makefile b/japanese/uim/Makefile index 2b5ad71ca969..27ab01b994c0 100644 --- a/japanese/uim/Makefile +++ b/japanese/uim/Makefile @@ -7,6 +7,7 @@ PORTNAME= uim PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= japanese x11 MASTER_SITES= http://freedesktop.org/Software/uim/ diff --git a/japanese/uim/files/patch-Makefile.in b/japanese/uim/files/patch-Makefile.in index 6ec0c3dc7c7c..8944327835d2 100644 --- a/japanese/uim/files/patch-Makefile.in +++ b/japanese/uim/files/patch-Makefile.in @@ -1,5 +1,14 @@ ---- Makefile.in.orig Wed Dec 10 23:28:20 2003 -+++ Makefile.in Wed Dec 10 23:29:10 2003 +--- Makefile.in.orig Mon Dec 8 21:20:20 2003 ++++ Makefile.in Sun Dec 21 01:41:32 2003 +@@ -187,7 +187,7 @@ + + DISTCLEANFILES = uim.pc + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = uim.pc + + noinst_PROGRAMS = $(gtk_entry) uim-agent @@ -198,7 +198,7 @@ @GTK2_TRUE@gtk_entry_CFLAGS = @GTK2_CFLAGS@ diff --git a/japanese/uim/files/patch-configure b/japanese/uim/files/patch-configure new file mode 100644 index 000000000000..f4fa7ee6522b --- /dev/null +++ b/japanese/uim/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Mon Dec 8 21:20:21 2003 ++++ configure Sun Dec 21 01:34:43 2003 +@@ -19073,6 +19073,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/japanese/uim/files/patch-helper:Makefile.in b/japanese/uim/files/patch-helper:Makefile.in index 6b25521297c7..9016821fca08 100644 --- a/japanese/uim/files/patch-helper:Makefile.in +++ b/japanese/uim/files/patch-helper:Makefile.in @@ -1,10 +1,12 @@ ---- helper/Makefile.in.orig Sun Nov 9 11:11:01 2003 -+++ helper/Makefile.in Sun Nov 9 11:14:36 2003 -@@ -140,7 +140,8 @@ +--- helper/Makefile.in.orig Mon Dec 8 21:20:55 2003 ++++ helper/Makefile.in Sun Dec 21 01:36:26 2003 +@@ -180,8 +180,9 @@ + EXTRA_DIST = GNOME_UimApplet.server.in.in - serverdir = $(libdir)/bonobo/servers +-serverdir = $(libdir)/bonobo/servers -server_DATA = GNOME_UimApplet.server ++serverdir = $(prefix)/libdata/bonobo/servers +@APPLET_TRUE@server_DATA = GNOME_UimApplet.server +@APPLET_FALSE@server_DATA = server_in_files = $(server_DATA:=.in) diff --git a/japanese/uim/pkg-plist b/japanese/uim/pkg-plist index 01ac95d2f9a4..f1c340f4e50a 100644 --- a/japanese/uim/pkg-plist +++ b/japanese/uim/pkg-plist @@ -4,15 +4,12 @@ bin/uim-helper-server bin/uim-xim include/uim/uim-helper.h include/uim/uim.h -%%GNOME%%lib/bonobo/servers/GNOME_UimApplet.server -%%GTK%%lib/gtk-2.0/2.2.0/immodules/im-uim.a -%%GTK%%lib/gtk-2.0/2.2.0/immodules/im-uim.la +%%GNOME%%libdata/bonobo/servers/GNOME_UimApplet.server %%GTK%%lib/gtk-2.0/2.2.0/immodules/im-uim.so lib/libuim.a -lib/libuim.la lib/libuim.so lib/libuim.so.0 -lib/pkgconfig/uim.pc +libdata/pkgconfig/uim.pc %%GNOME%%libexec/uim-helper-applet %%PORTDOCS%%%%DOCSDIR_JA%%/README.ja %%PORTDOCS%%%%DOCSDIR%%/README diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 2b5ad71ca969..27ab01b994c0 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -7,6 +7,7 @@ PORTNAME= uim PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= japanese x11 MASTER_SITES= http://freedesktop.org/Software/uim/ diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in index 6ec0c3dc7c7c..8944327835d2 100644 --- a/textproc/uim/files/patch-Makefile.in +++ b/textproc/uim/files/patch-Makefile.in @@ -1,5 +1,14 @@ ---- Makefile.in.orig Wed Dec 10 23:28:20 2003 -+++ Makefile.in Wed Dec 10 23:29:10 2003 +--- Makefile.in.orig Mon Dec 8 21:20:20 2003 ++++ Makefile.in Sun Dec 21 01:41:32 2003 +@@ -187,7 +187,7 @@ + + DISTCLEANFILES = uim.pc + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = uim.pc + + noinst_PROGRAMS = $(gtk_entry) uim-agent @@ -198,7 +198,7 @@ @GTK2_TRUE@gtk_entry_CFLAGS = @GTK2_CFLAGS@ diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure new file mode 100644 index 000000000000..f4fa7ee6522b --- /dev/null +++ b/textproc/uim/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Mon Dec 8 21:20:21 2003 ++++ configure Sun Dec 21 01:34:43 2003 +@@ -19073,6 +19073,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/textproc/uim/files/patch-helper:Makefile.in b/textproc/uim/files/patch-helper:Makefile.in index 6b25521297c7..9016821fca08 100644 --- a/textproc/uim/files/patch-helper:Makefile.in +++ b/textproc/uim/files/patch-helper:Makefile.in @@ -1,10 +1,12 @@ ---- helper/Makefile.in.orig Sun Nov 9 11:11:01 2003 -+++ helper/Makefile.in Sun Nov 9 11:14:36 2003 -@@ -140,7 +140,8 @@ +--- helper/Makefile.in.orig Mon Dec 8 21:20:55 2003 ++++ helper/Makefile.in Sun Dec 21 01:36:26 2003 +@@ -180,8 +180,9 @@ + EXTRA_DIST = GNOME_UimApplet.server.in.in - serverdir = $(libdir)/bonobo/servers +-serverdir = $(libdir)/bonobo/servers -server_DATA = GNOME_UimApplet.server ++serverdir = $(prefix)/libdata/bonobo/servers +@APPLET_TRUE@server_DATA = GNOME_UimApplet.server +@APPLET_FALSE@server_DATA = server_in_files = $(server_DATA:=.in) diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist index 01ac95d2f9a4..f1c340f4e50a 100644 --- a/textproc/uim/pkg-plist +++ b/textproc/uim/pkg-plist @@ -4,15 +4,12 @@ bin/uim-helper-server bin/uim-xim include/uim/uim-helper.h include/uim/uim.h -%%GNOME%%lib/bonobo/servers/GNOME_UimApplet.server -%%GTK%%lib/gtk-2.0/2.2.0/immodules/im-uim.a -%%GTK%%lib/gtk-2.0/2.2.0/immodules/im-uim.la +%%GNOME%%libdata/bonobo/servers/GNOME_UimApplet.server %%GTK%%lib/gtk-2.0/2.2.0/immodules/im-uim.so lib/libuim.a -lib/libuim.la lib/libuim.so lib/libuim.so.0 -lib/pkgconfig/uim.pc +libdata/pkgconfig/uim.pc %%GNOME%%libexec/uim-helper-applet %%PORTDOCS%%%%DOCSDIR_JA%%/README.ja %%PORTDOCS%%%%DOCSDIR%%/README |