Attachment 38154 Details for Bug 60466 – file.diff

[patch] file.diff

file.diff (text/plain), 3.12 KB, created by tkato on 2003-12-21 14:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-12-21 14:10:14 UTC

Size: 3.12 KB

patch

obsolete

>diff -urN /usr/ports/japanese/uim/Makefile japanese/uim/Makefile
>--- /usr/ports/japanese/uim/Makefile	Fri Dec 12 00:50:15 2003
>+++ japanese/uim/Makefile	Sun Dec 21 01:37:09 2003
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	uim
> PORTVERSION=	0.2.0
>+PORTREVISION=	1
> CATEGORIES=	japanese x11
> MASTER_SITES=	http://freedesktop.org/Software/uim/
> 
>diff -urN /usr/ports/japanese/uim/files/patch-Makefile.in japanese/uim/files/patch-Makefile.in
>--- /usr/ports/japanese/uim/files/patch-Makefile.in	Thu Dec 11 19:02:59 2003
>+++ japanese/uim/files/patch-Makefile.in	Sun Dec 21 01:41:39 2003
>@@ -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 -urN /usr/ports/japanese/uim/files/patch-configure japanese/uim/files/patch-configure
>--- /usr/ports/japanese/uim/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ japanese/uim/files/patch-configure	Sun Dec 21 01:34:50 2003
>@@ -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 -urN /usr/ports/japanese/uim/files/patch-helper:Makefile.in japanese/uim/files/patch-helper:Makefile.in
>--- /usr/ports/japanese/uim/files/patch-helper:Makefile.in	Sun Nov  9 11:36:37 2003
>+++ japanese/uim/files/patch-helper:Makefile.in	Sun Dec 21 01:36:34 2003
>@@ -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 -urN /usr/ports/japanese/uim/pkg-plist japanese/uim/pkg-plist
>--- /usr/ports/japanese/uim/pkg-plist	Fri Dec 12 00:50:15 2003
>+++ japanese/uim/pkg-plist	Sun Dec 21 01:36:57 2003
>@@ -4,15 +4,12 @@
> 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

Actions: View | Diff

Attachments on bug 60466: 38154