[36008] trunk/dports/sysutils/FDclone

takanori at macports.org takanori at macports.org
Mon Apr 14 03:46:00 PDT 2008 

Revision: 36008
          http://trac.macosforge.org/projects/macports/changeset/36008
Author:   takanori at macports.org
Date:     2008-04-14 03:45:59 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
FDclone: Version bump to 2.09h.

Modified Paths:
--------------
    trunk/dports/sysutils/FDclone/Portfile
    trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff

Added Paths:
-----------
    trunk/dports/sysutils/FDclone/files/patch-kanjicnv.c.diff
    trunk/dports/sysutils/FDclone/files/patch-libc.c.diff
    trunk/dports/sysutils/FDclone/files/patch-printf.h.diff
    trunk/dports/sysutils/FDclone/files/patch-termio.c.diff

Modified: trunk/dports/sysutils/FDclone/Portfile
===================================================================
--- trunk/dports/sysutils/FDclone/Portfile	2008-04-14 10:45:21 UTC (rev 36007)
+++ trunk/dports/sysutils/FDclone/Portfile	2008-04-14 10:45:59 UTC (rev 36008)
@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            FDclone
-version         2.09g
+version         2.09h
 categories      sysutils shells
 maintainers     takanori
 description     File & Directory Maintenance Tool
@@ -14,24 +14,18 @@
 master_sites    http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
                 ftp://ftp.unixusers.net/src/fdclone/
 distname        FD-${version}
-patchfiles      patch-Makefile.in.diff
-checksums       md5 a367ee859143ca5e386f343a240dfb6b \
-                sha1 80f13c13a31aff7badfd82fee4799b72c664b1c2 \
-                rmd160 5ef08b45583cc86f7295cf8b2f9c434cd73c6a67
+patchfiles      patch-Makefile.in.diff \
+		patch-kanjicnv.c.diff patch-printf.h.diff patch-termio.c.diff \
+		patch-libc.c.diff
+checksums       md5 5252ba416b0043f05043d51630295ff4 \
+                sha1 587f378ba457bd9028c26df22cfc8c6d92f69a36 \
+                rmd160 387df88ac16ddc67b0f9255023700c2a619ef0cb
 
 depends_lib     port:ncurses
 
 set editor      ""
 set pager       ""
 
-post-patch {
-    foreach f [glob ${worksrcpath}/*.c] {
-        reinplace "s|\\(#include <unistd\.h>\\)|\\1\\\n#include <sys/types\.h>|" ${f}
-    }
-    reinplace "s|\$(PREFIX)/man|\$(DATATOP)/man|g" ${worksrcpath}/Makefile.in
-    reinplace "s|\$(CC) __MEM__|\$(CC) \$(CFLAGS) __MEM__|g" ${worksrcpath}/Makefile.in
-}
-
 configure {
     if {[variant_isset nojpnmes]} {
         system "echo \"#define _NOJPNMES\" >> ${worksrcpath}/config.hin"

Modified: trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff	2008-04-14 10:45:21 UTC (rev 36007)
+++ trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff	2008-04-14 10:45:59 UTC (rev 36008)
@@ -1,6 +1,24 @@
---- Makefile.in.orig	2007-09-16 02:02:19.000000000 +0900
-+++ Makefile.in	2007-09-16 02:02:40.000000000 +0900
-@@ -295,12 +295,12 @@
+--- Makefile.in.orig	2008-03-15 00:00:00.000000000 +0900
++++ Makefile.in	2008-04-14 19:16:03.000000000 +0900
+@@ -13,7 +13,7 @@
+ BINDIR	= $(BUILD)$(BINTOP)
+ DATATOP	= $(PREFIX)/share
+ DATADIR	= $(BUILD)$(DATATOP)/fd
+-MANTOP	= $(PREFIX)/man
++MANTOP	= $(DATATOP)/man
+ MANDIR	= $(BUILD)$(MANTOP)/man$(MANSEC)
+ CATDIR	= $(BUILD)$(MANTOP)/cat$(MANSEC)
+ JMANDIR	= $(BUILD)$(MANTOP)__LANGDIR__/man$(MANSEC)
+@@ -151,7 +151,7 @@
+ all: $(PROGRAM)$(EXE) $(PROGRAM).$(MANSEC) $(TABLES)
+ 
+ $(PROGRAM)$(EXE): $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(ARGS)
+-	$(CC) __MEM__ __LNK__ __OBJLIST__ $(LDFLAGS)
++	$(CC) $(CFLAGS) __MEM__ __LNK__ __OBJLIST__ $(LDFLAGS)
+ 	__RENAME__ $@ $(PROGRAM)
+ 	__AOUT2EXE__ $(PROGRAM)
+ 	__REMOVE__ $(PROGRAM)
+@@ -296,12 +296,12 @@
  	-$(RM) $(BINDIR)/$(ALIAS)$(EXE)
  	$(LN) $(BINDIR)/$(PROGRAM)$(EXE) $(BINDIR)/$(ALIAS)$(EXE)
  	$(CHMOD) a+rx $(BINDIR)/$(ALIAS)$(EXE)

Added: trunk/dports/sysutils/FDclone/files/patch-kanjicnv.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-kanjicnv.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/FDclone/files/patch-kanjicnv.c.diff	2008-04-14 10:45:59 UTC (rev 36008)
@@ -0,0 +1,10 @@
+--- kanjicnv.c.orig	2008-03-15 00:00:00.000000000 +0900
++++ kanjicnv.c	2008-04-14 19:22:35.000000000 +0900
+@@ -7,6 +7,7 @@
+ #include "machine.h"
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #ifndef	NOUNISTDH
+ #include <unistd.h>

Added: trunk/dports/sysutils/FDclone/files/patch-libc.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-libc.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/FDclone/files/patch-libc.c.diff	2008-04-14 10:45:59 UTC (rev 36008)
@@ -0,0 +1,31 @@
+--- libc.c.orig	2008-03-15 00:00:00.000000000 +0900
++++ libc.c	2008-04-14 19:33:37.000000000 +0900
+@@ -628,8 +628,8 @@
+ 
+ 	while (i < *lenp && s2[j]) {
+ 		if (iskanji1(s2, j)) {
+-			i += snprintf2(&(s1[i]), *lenp - i + 1,
+-				"%.2s", &(s2[j]));
++			snprintf2(&(s1[i]), *lenp - i + 1, "%.2s", &(s2[j]));
++			i += strlen(&(s1[i]));
+ 			j += 2;
+ 			continue;
+ 		}
+@@ -642,13 +642,15 @@
+ 		else if (isskana(s2, j)) /*EMPTY*/;
+ #endif
+ 		else if (iscntrl2(s2[j])) {
+-			i += snprintf2(&(s1[i]), *lenp - i + 1,
++			snprintf2(&(s1[i]), *lenp - i + 1,
+ 				"^%c", (s2[j++] + '@') & 0x7f);
++			i += strlen(&(s1[i]));
+ 			continue;
+ 		}
+ 		else if (ismsb(s2[j])) {
+-			i += snprintf2(&(s1[i]), *lenp - i + 1,
++			snprintf2(&(s1[i]), *lenp - i + 1,
+ 				"\\%03o", s2[j++] & 0xff);
++			i += strlen(&(s1[i]));
+ 			continue;
+ 		}
+ 		s1[i++] = s2[j++];

Added: trunk/dports/sysutils/FDclone/files/patch-printf.h.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-printf.h.diff	                        (rev 0)
+++ trunk/dports/sysutils/FDclone/files/patch-printf.h.diff	2008-04-14 10:45:59 UTC (rev 36008)
@@ -0,0 +1,15 @@
+--- printf.h.orig	2008-03-15 00:00:00.000000000 +0900
++++ printf.h	2008-04-14 19:25:10.000000000 +0900
+@@ -7,6 +7,12 @@
+ #ifndef	__PRINTF_H_
+ #define	__PRINTF_H_
+ 
++#ifndef	__SYS_TYPES_STAT_H_
++#define	__SYS_TYPES_STAT_H_
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++
+ #ifdef	USESTDARGH
+ #include <stdarg.h>
+ #define	VA_START(a, f)		va_start(a, f)

Added: trunk/dports/sysutils/FDclone/files/patch-termio.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-termio.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/FDclone/files/patch-termio.c.diff	2008-04-14 10:45:59 UTC (rev 36008)
@@ -0,0 +1,15 @@
+--- termio.c.orig	2008-03-15 00:00:00.000000000 +0900
++++ termio.c	2008-04-14 19:27:13.000000000 +0900
+@@ -396,8 +396,10 @@
+ 	if (*fdp >= 0) fd = *fdp;
+ 	else if ((fd = newdup(open(_PATH_TTY, flags, 0666))) < 0) return(-1);
+ 	if (*fpp) fp = *fpp;
+-	else if (!(fp = fdopen(fd, "w+b"))
+-	&& !(fp = fopen(_PATH_TTY, "w+b"))) {
++#ifndef	SELECTRWONLY
++	else if ((fp = fdopen(fd, "w+b"))) /*EMPTY*/;
++#endif
++	else if (!(fp = fopen(_PATH_TTY, "w+b"))) {
+ 		close(fd);
+ 		return(-1);
+ 	}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080414/7fba3c24/attachment.html

More information about the macports-changes mailing list