[94821] trunk/dports/sysutils/FDclone

30 Jun 2012

Revision: 94821
          https://trac.macports.org/changeset/94821
Author:   takanori@macports.org
Date:     2012-06-30 08:19:49 -0700 (Sat, 30 Jun 2012)
Log Message:
-----------
FDclone: version 3.00l

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

Added Paths:
-----------
    trunk/dports/sysutils/FDclone/files/patch-catalog.c.diff
    trunk/dports/sysutils/FDclone/files/patch-custom.c.diff

Removed Paths:
-------------
    trunk/dports/sysutils/FDclone/files/engmes.diff
    trunk/dports/sysutils/FDclone/files/patch-custom.c.diff

Modified: trunk/dports/sysutils/FDclone/Portfile
===================================================================

--- trunk/dports/sysutils/FDclone/Portfile	2012-06-30 15:19:02 UTC (rev 94820)
+++ trunk/dports/sysutils/FDclone/Portfile	2012-06-30 15:19:49 UTC (rev 94821)
@@ -3,7 +3,7 @@
 PortSystem      1.0
 
 name            FDclone
-version         3.00k
+version         3.00l
 categories      sysutils shells
 maintainers     takanori openmaintainer
 description     File & Directory Maintenance Tool
@@ -20,7 +20,7 @@
                 patch-custom.c.diff \
                 patch-fd.h.diff \
                 patch-file.c.diff
-checksums       rmd160 613f9a7d961c7dc422297dbb2ad6bc78611875e5
+checksums       rmd160 b9e3552229780b39b53b1859766eb75fe82bf68c
 
 depends_lib     port:ncurses
 
@@ -44,7 +44,7 @@
 }
 
 variant engmes description {Print messages in English} {
-    patchfiles-append   engmes.diff
+    patchfiles-append   patch-catalog.c.diff
 }
 
 variant nojpnmes requires engmes description {Legacy compatibility variant} {}

Deleted: trunk/dports/sysutils/FDclone/files/engmes.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/engmes.diff	2012-06-30 15:19:02 UTC (rev 94820)
+++ trunk/dports/sysutils/FDclone/files/engmes.diff	2012-06-30 15:19:49 UTC (rev 94821)
@@ -1,11 +0,0 @@
---- custom.c~	2012-03-09 23:29:06.000000000 +0900
-+++ custom.c	2012-03-09 23:29:40.000000000 +0900
-@@ -528,7 +528,7 @@
- 	{"FD_URLKCODE", &urlkcode, DEFVAL(NOCNV), URLKC_E, T_KNAM},
- #endif
- #if	!defined (_NOENGMES) && !defined (_NOJPNMES)
--	{"FD_MESSAGELANG", &messagelang, DEFVAL(NOCNV), MESL_E, T_MESLANG},
-+	{"FD_MESSAGELANG", &messagelang, DEFVAL("C"), MESL_E, T_MESLANG},
- #endif
- #ifdef	DEP_FILECONV
- 	{"FD_SJISPATH", &sjispath, DEFVAL(SJISPATH), SJSP_E, T_KPATHS},

Modified: trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff	2012-06-30 15:19:02 UTC (rev 94820)
+++ trunk/dports/sysutils/FDclone/files/patch-Makefile.in.diff	2012-06-30 15:19:49 UTC (rev 94821)
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2010-09-25 00:00:00.000000000 +0900
-+++ Makefile.in	2010-09-26 22:01:35.000000000 +0900
+--- Makefile.in.orig	2012-06-30 00:00:00.000000000 +0900
++++ Makefile.in	2012-06-30 11:14:53.000000000 +0900
 @@ -13,7 +13,7 @@
  BINDIR	= $(BUILD)$(BINTOP)
  DATATOP	= $(PREFIX)/share
@@ -9,25 +9,21 @@
  MANDIR	= $(BUILD)$(MANTOP)/man$(MANSEC)
  CATDIR	= $(BUILD)$(MANTOP)/cat$(MANSEC)
  JMANDIR	= $(BUILD)$(MANTOP)__LANGDIR__/man$(MANSEC)
-@@ -212,7 +212,7 @@
+@@ -227,7 +227,7 @@
  
  $(PROGRAM)$(EXE): $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(ARGS)
  __SLEEP__	@sleep 1
--	$(CC) __MEM__ __LNK__ __OBJLIST__ $(LDFLAGS)
-+	$(CC) $(CFLAGS) __MEM__ __LNK__ __OBJLIST__ $(LDFLAGS)
+-	$(CC) __MEM__ __LNK__ __OBJLIST__ $(FLDFLAGS)
++	$(CC) $(CFLAGS) __MEM__ __LNK__ __OBJLIST__ $(FLDFLAGS)
  __DJGPP1__	@ren $@ $(PROGRAM)
  __DJGPP1__	@aout2exe $(PROGRAM)
  __DJGPP1__	@del $(PROGRAM)
-@@ -450,12 +450,6 @@
- 		$(INSTALL) $(DICTTBL) __DATADIR__; \
- 		$(CHMOD) a+r-x __DATADIR__/$(DICTTBL); \
- 	fi
--	[ -d $(JMANDIR) ] || ./mkdir_p$(EXE) $(JMANDIR)
--	$(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)/$(PROGRAM).$(MANSEC)
--	$(CHMOD) a+r-x $(JMANDIR)/$(PROGRAM).$(MANSEC)
--	-$(RM) $(JMANDIR)/$(ALIAS).$(MANSEC)
--	$(LN) $(JMANDIR)/$(PROGRAM).$(MANSEC) $(JMANDIR)/$(ALIAS).$(MANSEC)
--	$(CHMOD) a+r-x $(JMANDIR)/$(ALIAS).$(MANSEC)
- 	[ -d $(MANDIR) ] || ./mkdir_p$(EXE) $(MANDIR)
- 	$(INSTALL) $(MANSRC) $(MANDIR)/$(PROGRAM).$(MANSEC)
- 	$(CHMOD) a+r-x $(MANDIR)/$(PROGRAM).$(MANSEC)
+@@ -462,7 +462,7 @@
+ ############################################################
+ # to install all
+ 
+-install: $(PROGRAM)$(EXE) mkdir_p$(EXE) install-table install-man install-jman
++install: $(PROGRAM)$(EXE) mkdir_p$(EXE) install-table install-man
+ 	[ -d $(BINDIR) ] || ./mkdir_p$(EXE) $(BINDIR)
+ 	$(INSTALL) __INSTSTRIP__ $(PROGRAM)$(EXE) $(BINDIR)
+ 	$(CHMOD) a+rx $(BINDIR)/$(PROGRAM)$(EXE)

Added: trunk/dports/sysutils/FDclone/files/patch-catalog.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-catalog.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/FDclone/files/patch-catalog.c.diff	2012-06-30 15:19:49 UTC (rev 94821)
@@ -0,0 +1,11 @@
+--- catalog.c.orig	2012-06-30 00:00:00.000000000 +0900
++++ catalog.c	2012-07-01 00:05:59.000000000 +0900
+@@ -23,7 +23,7 @@
+ static int NEAR opencatalog __P_((CONST char *));
+ 
+ char *cattblpath = NULL;
+-CONST char *catname = NULL;
++CONST char *catname = "C";
+ 
+ static u_char *catbuf = NULL;
+ static ALLOC_T catsize = (ALLOC_T)0;

Deleted: trunk/dports/sysutils/FDclone/files/patch-custom.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-custom.c.diff	2012-06-30 15:19:02 UTC (rev 94820)
+++ trunk/dports/sysutils/FDclone/files/patch-custom.c.diff	2012-06-30 15:19:49 UTC (rev 94821)
@@ -1,37 +0,0 @@
---- custom.c.orig	2010-09-25 00:00:00.000000000 +0900
-+++ custom.c	2012-03-09 19:41:46.000000000 +0900
-@@ -509,20 +509,20 @@
- 		DEFVAL(UNICODEBUFFER), UNBF_E, T_BOOL},
- #endif
- #if	defined (DEP_KCONV) || (!defined (_NOENGMES) && !defined (_NOJPNMES))
--	{"FD_LANGUAGE", &outputkcode, DEFVAL(NOCNV), LANG_E, _B_(T_KOUT)},
-+	{"FD_LANGUAGE", &outputkcode, DEFVAL("utf8"), LANG_E, _B_(T_KOUT)},
- #endif
- #ifdef	DEP_FILECONV
--	{"FD_DEFKCODE", &defaultkcode, DEFVAL(NOCNV), DFKC_E, T_KNAM},
-+	{"FD_DEFKCODE", &defaultkcode, DEFVAL("utf8"), DFKC_E, T_KNAM},
- #endif
- #ifdef	DEP_KCONV
--	{"FD_INPUTKCODE", &inputkcode, DEFVAL(NOCNV), IPKC_E, _B_(T_KIN)},
-+	{"FD_INPUTKCODE", &inputkcode, DEFVAL("utf8"), IPKC_E, _B_(T_KIN)},
- #endif
- #if	defined (DEP_KCONV) && defined (DEP_PTY)
--	{"FD_PTYINKCODE", &ptyinkcode, DEFVAL(NOCNV), PIKC_E, T_KTERM},
--	{"FD_PTYOUTKCODE", &ptyoutkcode, DEFVAL(NOCNV), POKC_E, T_KTERM},
-+	{"FD_PTYINKCODE", &ptyinkcode, DEFVAL("utf8"), PIKC_E, T_KTERM},
-+	{"FD_PTYOUTKCODE", &ptyoutkcode, DEFVAL("utf8"), POKC_E, T_KTERM},
- #endif
- #ifdef	DEP_FILECONV
--	{"FD_FNAMEKCODE", &fnamekcode, DEFVAL(NOCNV), FNKC_E, T_KNAM},
-+	{"FD_FNAMEKCODE", &fnamekcode, DEFVAL("utf8-mac"), FNKC_E, T_KNAM},
- #endif
- #if	defined (DEP_FILECONV) && defined (DEP_URLPATH)
- 	{"FD_URLKCODE", &urlkcode, DEFVAL(NOCNV), URLKC_E, T_KNAM},
-@@ -822,6 +822,7 @@
- 		case T_KOUT:
- 		case T_KNAM:
- 		case T_KTERM:
-+			if (!cp) cp = def_str(no);
- 			n = (1 << (env_type(no) - T_KIN));
- 			*((int *)(envlist[no].var)) = getlang(cp, n);
- 			break;

Added: trunk/dports/sysutils/FDclone/files/patch-custom.c.diff
===================================================================
--- trunk/dports/sysutils/FDclone/files/patch-custom.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/FDclone/files/patch-custom.c.diff	2012-06-30 15:19:49 UTC (rev 94821)
@@ -0,0 +1,17 @@
+--- custom.c.orig	2012-06-30 00:00:00.000000000 +0900
++++ custom.c	2012-06-30 22:32:55.000000000 +0900
+@@ -4004,11 +4004,10 @@
+ 	char *new;
+ 	int i, j, n;
+ 
+-	if (origflaglist) new = NULL;
++	if (origflaglist || origmaxfdtype <= 0) new = NULL;
+ 	else {
+-		for (n = 0; n < origmaxfdtype; n++) /*EMPTY*/;
+-		origflaglist = new = Xmalloc(n * sizeof(char));
+-		memset(origflaglist, 0, n * sizeof(char));
++		origflaglist = new = Xmalloc(origmaxfdtype * sizeof(char));
++		memset(origflaglist, 0, origmaxfdtype * sizeof(char));
+ 	}
+ 
+ 	for (i = n = 0; i < maxfdtype; i++) {

    

[94821] trunk/dports/sysutils/FDclone

takanori＠macports.org