Index: head/textproc/nfbtrans/Makefile =================================================================== --- head/textproc/nfbtrans/Makefile (revision 134918) +++ head/textproc/nfbtrans/Makefile (revision 134919) @@ -1,50 +1,50 @@ # New ports collection makefile for: nfbtrans # Date created: 30 Aug 1998 # Whom: Masafumi NAKANE # # $FreeBSD$ # PORTNAME= nfbtrans -PORTVERSION= 7.58 +PORTVERSION= 7.74 CATEGORIES= textproc MASTER_SITES= http://www.nfb.org/braille/nfbtrans/ DISTNAME= nfbtr${PORTVERSION:S/.//} MAINTAINER= max@FreeBSD.org COMMENT= ASCII text to Grade Two braille translator RESTRICTED= "Unclear copyright status" -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip USE_ZIP= yes EXTRACT_BEFORE_ARGS= -q -a -L -o NO_WRKSUBDIR= yes ALL_TARGET= freebsd MAKEFILE= makefile .include .if ${ARCH} == "ia64" || ${ARCH} == "amd64" BROKEN= "Does not install on ia64 or amd64 (segfault during install)" .endif do-install: ${MKDIR} ${PREFIX}/share/nfbtrans/tables ${INSTALL_PROGRAM} ${WRKSRC}/nfbtrans ${PREFIX}/bin .for f in braille.tab back.tab english.dic nfbtrans.cnf menu.cnf ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/nfbtrans .endfor - unzip -q -L -a -o ${WRKSRC}/tables.zip -d ${PREFIX}/share/nfbtrans/tables + ${UNZIP_CMD} -q -L -a -o ${WRKSRC}/tables.zip -d ${PREFIX}/share/nfbtrans/tables + ${UNZIP_CMD} -q -L -a -o ${WRKSRC}/spanish.zip -d ${PREFIX}/share/nfbtrans/spanish .if !defined(NOPORTDOCS) @${ECHO} '~0 ~-pw=80 ~-ls=99 ~-pl=56 ~-if=12 ~-fc=. ~o5 ~p- ~-ip=0 ~-oc=1' \ | ${CAT} - ${WRKSRC}/nfbtrans.fmt > ${WRKSRC}/nfbprint.fmt @${WRKSRC}/nfbtrans st=${WRKSRC}/stat.txt qm=1 ob=oc=15 \ ${WRKSRC}/nfbprint.fmt > ${WRKSRC}/nfbtrans.doc ${MKDIR} ${PREFIX}/share/doc/nfbtrans -.for f in read.me nfbtrans.doc nfbtrans.fmt tvfreqs.fmt +.for f in readme.txt nfbtrans.doc nfbtrans.fmt tvfreqs.fmt ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/nfbtrans .endfor .endif .include Property changes on: head/textproc/nfbtrans/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/textproc/nfbtrans/distinfo =================================================================== --- head/textproc/nfbtrans/distinfo (revision 134918) +++ head/textproc/nfbtrans/distinfo (revision 134919) @@ -1,2 +1,2 @@ -MD5 (nfbtr758.zip) = a67cc0e4a37276299071f35cef130c81 -SIZE (nfbtr758.zip) = 432812 +MD5 (nfbtr774.zip) = 46d45c0ef54b659aca8f773c08caa057 +SIZE (nfbtr774.zip) = 470847 Property changes on: head/textproc/nfbtrans/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/textproc/nfbtrans/files/patch-ad =================================================================== --- head/textproc/nfbtrans/files/patch-ad (revision 134918) +++ head/textproc/nfbtrans/files/patch-ad (nonexistent) @@ -1,11 +0,0 @@ ---- nfbtrans.cnf.orig Sun Aug 30 06:11:38 1998 -+++ nfbtrans.cnf Sun Aug 30 07:52:45 1998 -@@ -30,7 +30,7 @@ - ;s0=~[DL instructs juliet printer to ignore formfeed in spool mode - so=15 sound enabled - sp=0 spool mode off don't use dos print for backround printing --st=c:\stat.txt statistics file -+st=stat.txt statistics file - ;tv=2000 timming value for microsoft C not used otherwise - - ;Assign extension types Property changes on: head/textproc/nfbtrans/files/patch-ad ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1.1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/textproc/nfbtrans/files/patch-aa =================================================================== --- head/textproc/nfbtrans/files/patch-aa (revision 134918) +++ head/textproc/nfbtrans/files/patch-aa (revision 134919) @@ -1,43 +1,45 @@ ---- makefile.orig Sat Sep 23 13:46:52 2000 -+++ makefile Thu Nov 30 04:13:38 2000 +--- makefile.orig Fri Jan 4 18:23:22 2002 ++++ makefile Mon May 9 17:39:33 2005 @@ -3,6 +3,11 @@ #translation software written by the National Federation of the Blind - #compile under the Unix operating system. + #compile under unix, MSVC, or djgpp # +#Installation prefix: +PREFIX?=/usr/local +#Library path: +UNIX_PATH?=${PREFIX}/share/nfbtrans/ +# #The source and object files are as follows: SRCFILES=nfbtrans.c nfbpatch.c -@@ -10,8 +15,8 @@ +@@ -10,8 +15,10 @@ LIBS= -ltermcap #Compiler and linking flags are as follows: --CFLAGS="-O" +-CFLAGS=-O -CC=gcc ++#CFLAGS=-O ++#CC=gcc +CFLAGS+=-O -DUNIX_PATH=\\\"${UNIX_PATH}\\\" +CC?=gcc LDFLAGS=-Bdynamic default: -@@ -21,6 +26,7 @@ - @echo "make ultrix" - @echo "make aix" +@@ -23,6 +30,7 @@ @echo "make linux" + @echo "make djgpp" + @echo "make msvc" + @echo "make freebsd" all: nfbtrans - nfbtrans: $(OBJFILES) -@@ -28,6 +34,9 @@ + djgppall: nfbtrans.exe +@@ -35,6 +43,9 @@ ultrix: $(MAKE) CFLAGS=-O + +freebsd: + ${MAKE} all CFLAGS="${CFLAGS} -Dfreebsd" linux: $(MAKE) all CFLAGS="-O -Dlinux" Property changes on: head/textproc/nfbtrans/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/textproc/nfbtrans/files/patch-ab =================================================================== --- head/textproc/nfbtrans/files/patch-ab (revision 134918) +++ head/textproc/nfbtrans/files/patch-ab (revision 134919) @@ -1,21 +1,21 @@ ---- nfbtrans.c.orig Sat Sep 23 20:45:38 2000 -+++ nfbtrans.c Thu Nov 30 04:15:53 2000 -@@ -2,7 +2,9 @@ +--- nfbtrans.c.orig Mon Nov 4 08:10:00 2002 ++++ nfbtrans.c Mon May 9 17:45:14 2005 +@@ -6,7 +6,9 @@ #define LINT_ARGS #define DOS #else +#ifndef UNIX_PATH #define UNIX_PATH "/usr/local/lib/" +#endif - #endif /* unix */ - #ifndef lint - #endif /* lint */ -@@ -24,7 +26,7 @@ - #include + #endif /* unix */ + #include + #include +@@ -27,7 +29,7 @@ #include #define MAXARGS 7 --#if defined(sunos) || defined(linux) -+#if defined(sunos) || defined(linux) || defined(freebsd) + #endif /* DOS */ +-#if defined(sunos) || defined(linux) || defined(DJGPP) ++#if defined(sunos) || defined(linux) || defined(DJGPP) || defined(freebsd) #define max(a,b) (((a) > (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif Property changes on: head/textproc/nfbtrans/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/textproc/nfbtrans/files/patch-ac =================================================================== --- head/textproc/nfbtrans/files/patch-ac (revision 134918) +++ head/textproc/nfbtrans/files/patch-ac (revision 134919) @@ -1,23 +1,21 @@ ---- nfbpatch.c.orig Mon Mar 25 07:23:16 1996 -+++ nfbpatch.c Wed Sep 8 05:58:22 1999 -@@ -31,9 +31,11 @@ +--- nfbpatch.c.orig Thu May 24 08:41:34 2001 ++++ nfbpatch.c Mon May 9 17:48:33 2005 +@@ -21,7 +21,9 @@ #include - #define CASE_SHIFT 32 /* diference between upper and lower case */ + #define CASE_SHIFT 32 /* diference between upper and lower case */ +#ifndef freebsd - #define SYSVR4 /* use with gcc and solaris 2.1 see getpgrp. Also defines - * usleep. Wasn't able to link with /usr/ucblib/libucb.a - * Really no need for delay anyway */ + #define SYSVR4 /* use with gcc and solaris 2.1 see getpgrp. */ +#endif #ifdef ultrix #define ECHOCTL TCTLECH #endif -@@ -97,7 +99,7 @@ +@@ -88,7 +90,7 @@ int i; i = tcgetpgrp(0);/* Use stdin as the file descriptor */ -#ifdef SYSVR4 +#if defined(SYSVR4) || defined(freebsd) if (i == getpgrp()) return (1); #else Property changes on: head/textproc/nfbtrans/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/textproc/nfbtrans/pkg-plist =================================================================== --- head/textproc/nfbtrans/pkg-plist (revision 134918) +++ head/textproc/nfbtrans/pkg-plist (revision 134919) @@ -1,28 +1,35 @@ bin/nfbtrans share/doc/nfbtrans/nfbtrans.doc share/doc/nfbtrans/nfbtrans.fmt -share/doc/nfbtrans/read.me +share/doc/nfbtrans/readme.txt share/doc/nfbtrans/tvfreqs.fmt share/nfbtrans/back.tab share/nfbtrans/braille.tab share/nfbtrans/english.dic share/nfbtrans/menu.cnf share/nfbtrans/nfbtrans.cnf +share/nfbtrans/spanish/span1.tab +share/nfbtrans/spanish/span2.tab +share/nfbtrans/spanish/spanish1.cnf +share/nfbtrans/spanish/spanish1.dic +share/nfbtrans/spanish/spanish2.cnf +share/nfbtrans/spanish/spanish2.dic share/nfbtrans/tables/bhs_bhm.tab share/nfbtrans/tables/danish.tab share/nfbtrans/tables/dutch.tab share/nfbtrans/tables/dutch3.tab share/nfbtrans/tables/esperant.tab share/nfbtrans/tables/german.tab share/nfbtrans/tables/gnt.tab share/nfbtrans/tables/iceland.tab share/nfbtrans/tables/netcom.cap share/nfbtrans/tables/norweg.tab share/nfbtrans/tables/russian.tab share/nfbtrans/tables/span2.tab share/nfbtrans/tables/spanish.tab share/nfbtrans/tables/swedish.tab share/nfbtrans/tables/tables.doc @dirrm share/nfbtrans/tables +@dirrm share/nfbtrans/spanish @dirrm share/nfbtrans @dirrm share/doc/nfbtrans Property changes on: head/textproc/nfbtrans/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property