Attachment 26943 Details for Bug 45854 – file.diff

[patch] file.diff

file.diff (text/plain), 6.12 KB, created by tkato on 2002-11-30 05:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-11-30 05:40:03 UTC

Size: 6.12 KB

patch

obsolete

>diff -urN /usr/ports/japanese/ebview/Makefile japanese/ebview/Makefile
>--- /usr/ports/japanese/ebview/Makefile	Mon Nov 11 18:59:56 2002
>+++ japanese/ebview/Makefile	Sat Nov 30 09:48:28 2002
>@@ -6,25 +6,28 @@
> #
> 
> PORTNAME=	ebview
>-PORTVERSION=	0.1.4
>+PORTVERSION=	0.2.0
> CATEGORIES=	japanese
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR= ${PORTNAME}
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-LIB_DEPENDS=	eb.6:${PORTSDIR}/japanese/eb
>+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
>+		eb.6:${PORTSDIR}/japanese/eb
> 
> USE_GNOMENG=	yes
> USE_GNOME=	imlib
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>-MAKE_ARGS=	SUBDIRS=src
>-CONFIGURE_ARGS=	--disable-imlibtest
>+USE_AUTOMAKE_VER=	14
>+USE_AUTOCONF_VER=	253
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
>+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
>+		AUTOHEADER="${TRUE}"
> 
> post-install:
>-	${MKDIR} ${PREFIX}/share/locale/ja/LC_MESSAGES
>-	${INSTALL_DATA} ${WRKSRC}/po/ja.gmo ${PREFIX}/share/locale/ja/LC_MESSAGES/ebview.mo
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
> .for i in ChangeLog README
>diff -urN /usr/ports/japanese/ebview/distinfo japanese/ebview/distinfo
>--- /usr/ports/japanese/ebview/distinfo	Sat Apr  6 01:02:16 2002
>+++ japanese/ebview/distinfo	Sat Nov 30 08:59:39 2002
>@@ -1 +1 @@
>-MD5 (ebview-0.1.4.tar.gz) = d95ceca15303c1142c043849eff3efbe
>+MD5 (ebview-0.2.0.tar.gz) = 265a37aef3e165f36f7bcae223395274
>diff -urN /usr/ports/japanese/ebview/files/patch-configure.in japanese/ebview/files/patch-configure.in
>--- /usr/ports/japanese/ebview/files/patch-configure.in	Thu Jan  1 09:00:00 1970
>+++ japanese/ebview/files/patch-configure.in	Sat Nov 30 09:27:37 2002
>@@ -0,0 +1,13 @@
>+--- configure.in.orig	Tue Nov 19 15:04:30 2002
>++++ configure.in	Sat Nov 30 09:27:26 2002
>+@@ -14,8 +14,8 @@
>+ AM_GNU_GETTEXT
>+ 
>+ dnl Checks for libraries.
>+-AM_PATH_GTK(1.2.8)
>+-AM_PATH_IMLIB()
>++AM_PATH_GTK(1.2.8,, AC_MSG_ERROR(Cannot find GTK+ 1.2.8), gmodule gthread)
>++AM_PATH_GDK_IMLIB()
>+ eb_LIB_EB3
>+ 
>+ dnl Checks for header files.
>diff -urN /usr/ports/japanese/ebview/files/patch-src::Makefile.am japanese/ebview/files/patch-src::Makefile.am
>--- /usr/ports/japanese/ebview/files/patch-src::Makefile.am	Thu Jan  1 09:00:00 1970
>+++ japanese/ebview/files/patch-src::Makefile.am	Sat Nov 30 09:39:03 2002
>@@ -0,0 +1,19 @@
>+--- src/Makefile.am.orig	Sat Nov 16 15:33:46 2002
>++++ src/Makefile.am	Sat Nov 30 09:38:43 2002
>+@@ -2,12 +2,12 @@
>+ 
>+ AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
>+              @EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
>+-AM_CFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
>+-AM_CXXFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
>+-ebview_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ -lgdk_imlib -lpthread -lgthread \
>++AM_CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
>++AM_CXXFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
>++ebview_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@ \
>+                @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ 
>+ ebview_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
>+-ebview_client_LDADD = @GTK_LIBS@ @IMLIB_LIBS@ -lgdk_imlib -lpthread \
>++ebview_client_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@ \
>+                @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@
>+ ebview_client_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
>+ 
>diff -urN /usr/ports/japanese/ebview/files/patch-src::eb.c japanese/ebview/files/patch-src::eb.c
>--- /usr/ports/japanese/ebview/files/patch-src::eb.c	Thu Jan  1 09:00:00 1970
>+++ japanese/ebview/files/patch-src::eb.c	Sat Nov 30 10:05:27 2002
>@@ -0,0 +1,10 @@
>+--- src/eb.c.orig	Mon Nov 18 18:13:06 2002
>++++ src/eb.c	Sat Nov 30 09:04:05 2002
>+@@ -24,6 +24,7 @@
>+ #include <iconv.h>
>+ #include <langinfo.h>
>+ #include <wchar.h>
>++#include <pthread.h>
>+ 
>+ 
>+ #define MAX_HITS            50
>diff -urN /usr/ports/japanese/ebview/files/patch-src::ebview-client.c japanese/ebview/files/patch-src::ebview-client.c
>--- /usr/ports/japanese/ebview/files/patch-src::ebview-client.c	Thu Jan  1 09:00:00 1970
>+++ japanese/ebview/files/patch-src::ebview-client.c	Sat Nov 30 09:51:14 2002
>@@ -0,0 +1,13 @@
>+--- src/ebview-client.c.orig	Sat Nov 16 15:33:47 2002
>++++ src/ebview-client.c	Sat Nov 30 09:49:47 2002
>+@@ -1,8 +1,8 @@
>+ #include <stdio.h>
>+-#include <sys/socket.h>
>++#include <unistd.h>
>+ #include <sys/un.h>
>+ #include <sys/types.h>
>+-#include <unistd.h>
>++#include <sys/socket.h>
>+ 
>+ #include "../config.h"
>+ 
>diff -urN /usr/ports/japanese/ebview/files/patch-util::Makefile.am japanese/ebview/files/patch-util::Makefile.am
>--- /usr/ports/japanese/ebview/files/patch-util::Makefile.am	Thu Jan  1 09:00:00 1970
>+++ japanese/ebview/files/patch-util::Makefile.am	Sat Nov 30 09:53:00 2002
>@@ -0,0 +1,15 @@
>+--- util/Makefile.am.orig	Sat Nov 16 15:33:50 2002
>++++ util/Makefile.am	Sat Nov 30 09:52:44 2002
>+@@ -2,9 +2,9 @@
>+ 
>+ AM_CPPFLAGS= @EBCONF_PTHREAD_CPPFLAGS@ @EBCONF_EBINCS@ \
>+              @EBCONF_ZLIBINCS@ @EBCONF_INTLINCS@
>+-AM_CFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
>+-AM_CXXFLAGS = @GTK_CFLAGS@ @IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
>+-ebdump_LDADD = @GTK_LIBS@ @IMLIB_LIBS@\
>++AM_CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@
>++AM_CXXFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @EBCONF_PTHREAD_CFLAGS@ 
>++ebdump_LDADD = @GTK_LIBS@ @GDK_IMLIB_LIBS@\
>+                @EBCONF_EBLIBS@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ 
>+ ebdump_LDFLAGS = @EBCONF_PTHREAD_LDFLAGS@
>+ 
>diff -urN /usr/ports/japanese/ebview/pkg-plist japanese/ebview/pkg-plist
>--- /usr/ports/japanese/ebview/pkg-plist	Sat Apr  6 01:02:16 2002
>+++ japanese/ebview/pkg-plist	Sat Nov 30 10:03:00 2002
>@@ -1,5 +1,19 @@
>+bin/ebdump
> bin/ebview
>-share/locale/ja/LC_MESSAGES/ebview.mo
>+bin/ebview-client
> %%PORTDOCS%%share/doc/ebview/ChangeLog
> %%PORTDOCS%%share/doc/ebview/README
>+share/ebview/about.en
>+share/ebview/about.jp
>+share/ebview/endinglist-ja.xml
>+share/ebview/endinglist.xml
>+share/ebview/help/en/index.html
>+share/ebview/help/ja/index.html
>+share/ebview/searchengines.xml
>+share/ebview/shortcut.xml
>+share/locale/ja/LC_MESSAGES/ebview.mo
>+@dirrm share/ebview/help/ja
>+@dirrm share/ebview/help/en
>+@dirrm share/ebview/help
>+@dirrm share/ebview
> %%PORTDOCS%%@dirrm share/doc/ebview

Actions: View | Diff

Attachments on bug 45854: 26943