Attachment #82346 for bug #117801

View | Details | Raw Unified | Return to bug 117801
Collapse All | Expand All





PORTNAME=	dedit
PORTVERSION=	0.6.2.3
PORTREVISION=	6
CATEGORIES=	editors gnome
MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
DISTNAME=	${PORTNAME}_${PORTVERSION}

MAN1=		dedit.1
MANLANG=	"" ja

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 700042
BROKEN=		Broken with gcc 4.2
.endif

pre-patch:
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|dedit.ja.1||'

post-install:
	${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1

.include <bsd.port.mk>

Added Link Here

(-)files/patch-src-dedit.h (+10 lines)
1	--- src/dedit.h.orig 2007-11-04 00:35:59.000000000 +0100
2	+++ src/dedit.h 2007-11-04 00:36:08.000000000 +0100
3	@@ -30,7 +30,6 @@
4	extern GnomeMDI *DEmdi;
5
6	extern gchar *print_cmd;
7	-extern gboolean restarted;
8	extern const struct poptOption options[];
9	extern gint fs_code;
10	extern GtkWidget *file_sel;




--- src/file.c.orig	2000-10-13 08:45:02.000000000 +0200
+++ src/file.c	2007-11-04 00:56:29.000000000 +0100
@@ -46,7 +46,7 @@
 static void cancel_cb(GtkWidget *widget, gpointer *data);
 
 gint fs_code;
-static GtkWidget *file_sel;
+GtkWidget *file_sel;
 
 /*
  *
@@ -80,7 +80,7 @@
 	gtk_widget_destroy(GTK_WIDGET(file_sel));
 	file_sel = NULL;
 
-    if(file_name) {
+    if(file_name[0]) {
         dedit_new_document(NULL, file_name);
     }
 
@@ -318,7 +318,7 @@
 	gtk_widget_destroy(GTK_WIDGET(file_sel));
 	file_sel = NULL;
 
-    if(tmp){
+    if(tmp[0]){
         save_file(doc, tmp);
     }
 
@@ -330,7 +330,6 @@
 {
     gchar *tmp;
     gint i;
-    struct stat status;
     gzFile *gzfp = NULL;
     gboolean gzMode = FALSE; 
     FILE *fp = NULL;
@@ -340,7 +339,7 @@
     gchar backup[PATH_MAX];
     gboolean bkFlag = FALSE;
     
-    struct stat st0, st1;
+    struct stat st0;
 
 #ifdef TRACE_FUNC
     printf("save_file()\n");




--- src/jcode.c.orig	2000-10-13 08:45:02.000000000 +0200
+++ src/jcode.c	2007-11-04 00:49:09.000000000 +0100
@@ -251,7 +251,7 @@
 char *
 kanji_conv_auto(char *str, const char *dstset)
 {
-    unsigned char *buf, *ret;
+    char *buf, *ret;
     iconv_t cd;
     size_t insize = 0;
     size_t outsize = 0;
@@ -278,7 +278,7 @@
         break;
     }
     
-    buf = (unsigned char *)malloc(strlen(str)* 4 + 1);
+    buf = malloc(strlen(str)* 4 + 1);
     if(!buf)
         return NULL;
     
@@ -315,7 +315,6 @@
 {
    static char *jpcode = NULL;
    static char *locale_euc[]  = { JCODE_LOCALE_EUC, NULL };
-   static char *locale_jis[]  = { JCODE_LOCALE_JIS, NULL };
    static char *locale_sjis[] = { JCODE_LOCALE_SJIS, NULL };
 
    static struct LOCALE_TABLE {
@@ -352,7 +351,7 @@
 char *
 kanji_conv(char *str, const char *dstset, const char *srcset)
 {
-    unsigned char *buf, *ret;
+    char *buf, *ret;
     iconv_t cd;
     size_t insize = 0;
     size_t outsize = 0;
@@ -363,7 +362,7 @@
     if(!str)
         return NULL;
     
-    buf = (unsigned char *)malloc(strlen(str) * 4 + 1);
+    buf = malloc(strlen(str) * 4 + 1);
     if(!buf)
         return NULL;
     

Added Link Here

(-)files/patch-src-print.c (+11 lines)
1	--- src/print.c.orig 2007-11-04 00:37:11.000000000 +0100
2	+++ src/print.c 2007-11-04 00:38:50.000000000 +0100
3	@@ -46,7 +46,7 @@
4	static GtkWidget *print_dialog = NULL;
5	static GtkWidget *print_cmd_entry = NULL;
6
7	-static GtkWidget *file_sel;
8	+GtkWidget *file_sel;
9	gchar *print_cmd;
10
11	/* °õºþ

Return to bug 117801

Lines 7-13 Link Here

(-)Makefile (-8 / +2 lines)
7		7
8	PORTNAME= dedit	8	PORTNAME= dedit
9	PORTVERSION= 0.6.2.3	9	PORTVERSION= 0.6.2.3
10	PORTREVISION= 5	10	PORTREVISION= 6
11	CATEGORIES= editors gnome	11	CATEGORIES= editors gnome
12	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}	12	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
13	DISTNAME= ${PORTNAME}_${PORTVERSION}	13	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 27-38 Link Here
27	MAN1= dedit.1	27	MAN1= dedit.1
28	MANLANG= "" ja	28	MANLANG= "" ja
29		29
30	.include <bsd.port.pre.mk>
31
32	.if ${OSVERSION} >= 700042
33	BROKEN= Broken with gcc 4.2
34	.endif
35
36	pre-patch:	30	pre-patch:
37	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	31	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
38	's\|dedit.ja.1\|\|'	32	's\|dedit.ja.1\|\|'
Lines 40-43 Link Here
40	post-install:	34	post-install:
41	${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1	35	${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1
42		36
43	.include <bsd.port.post.mk>	37	.include <bsd.port.mk>

Added Link Here

(-)files/patch-src-file.c (+46 lines)
1	--- src/file.c.orig 2000-10-13 08:45:02.000000000 +0200
2	+++ src/file.c 2007-11-04 00:56:29.000000000 +0100
3	@@ -46,7 +46,7 @@
4	static void cancel_cb(GtkWidget widget, gpointer data);
5
6	gint fs_code;
7	-static GtkWidget *file_sel;
8	+GtkWidget *file_sel;
9
10	/*
11	*
12	@@ -80,7 +80,7 @@
13	gtk_widget_destroy(GTK_WIDGET(file_sel));
14	file_sel = NULL;
15
16	- if(file_name) {
17	+ if(file_name[0]) {
18	dedit_new_document(NULL, file_name);
19	}
20
21	@@ -318,7 +318,7 @@
22	gtk_widget_destroy(GTK_WIDGET(file_sel));
23	file_sel = NULL;
24
25	- if(tmp){
26	+ if(tmp[0]){
27	save_file(doc, tmp);
28	}
29
30	@@ -330,7 +330,6 @@
31	{
32	gchar *tmp;
33	gint i;
34	- struct stat status;
35	gzFile *gzfp = NULL;
36	gboolean gzMode = FALSE;
37	FILE *fp = NULL;
38	@@ -340,7 +339,7 @@
39	gchar backup[PATH_MAX];
40	gboolean bkFlag = FALSE;
41
42	- struct stat st0, st1;
43	+ struct stat st0;
44
45	#ifdef TRACE_FUNC
46	printf("save_file()\n");

Added Link Here

(-)files/patch-src-jcode.c (+46 lines)
1	--- src/jcode.c.orig 2000-10-13 08:45:02.000000000 +0200
2	+++ src/jcode.c 2007-11-04 00:49:09.000000000 +0100
3	@@ -251,7 +251,7 @@
4	char *
5	kanji_conv_auto(char str, const char dstset)
6	{
7	- unsigned char buf, ret;
8	+ char buf, ret;
9	iconv_t cd;
10	size_t insize = 0;
11	size_t outsize = 0;
12	@@ -278,7 +278,7 @@
13	break;
14	}
15
16	- buf = (unsigned char )malloc(strlen(str) 4 + 1);
17	+ buf = malloc(strlen(str)* 4 + 1);
18	if(!buf)
19	return NULL;
20
21	@@ -315,7 +315,6 @@
22	{
23	static char *jpcode = NULL;
24	static char *locale_euc[] = { JCODE_LOCALE_EUC, NULL };
25	- static char *locale_jis[] = { JCODE_LOCALE_JIS, NULL };
26	static char *locale_sjis[] = { JCODE_LOCALE_SJIS, NULL };
27
28	static struct LOCALE_TABLE {
29	@@ -352,7 +351,7 @@
30	char *
31	kanji_conv(char str, const char dstset, const char *srcset)
32	{
33	- unsigned char buf, ret;
34	+ char buf, ret;
35	iconv_t cd;
36	size_t insize = 0;
37	size_t outsize = 0;
38	@@ -363,7 +362,7 @@
39	if(!str)
40	return NULL;
41
42	- buf = (unsigned char )malloc(strlen(str) 4 + 1);
43	+ buf = malloc(strlen(str) * 4 + 1);
44	if(!buf)
45	return NULL;
46