Date: Mon, 15 Apr 2002 18:38:29 +0200 (CEST) From: Cyrille Lefevre <cyrille.lefevre@laposte.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/37100: Maintainer update: textproc/dico (portsurvey fix) Message-ID: <200204151638.g3FGcTl28338@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 37100 >Category: ports >Synopsis: Maintainer update: textproc/dico (portsurvey fix) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 15 09:40:00 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.5-PRERELEASE i386 >Organization: ACME >Environment: System: FreeBSD gits 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #14: Fri Jan 11 00:18:07 CET 2002 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: regarding fenner's portsurvey, dico files aren't fetchable anymore : http://people.freebsd.org/~fenner/portsurvey/cyrille.lefevre@laposte.net.html this patch solve this problem. Makefile PORTREVISION added MASTER_SITES and DISTNAME updated NO_WRKSUBDIR and PATCH_STRIP= deleted USE_ZIP and WRKSRC added distinfo updated pkg-plist updated files/patch-* cvs diff paths updated files/patch-lexique-version.dic deleted >How-To-Repeat: make fetch >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/dico/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 25 Dec 2001 00:10:13 -0000 1.6 +++ Makefile 15 Apr 2002 16:21:24 -0000 @@ -7,25 +7,36 @@ PORTNAME= dico PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= http://www.montefiore.ulg.ac.be/~geuzaine/BRONNE/WWW/ftp/ -# ftp://ftp.supelec.fr/lsi/pub/security/ -# have dico.tar.gz which fail because of EXTRACT_SUFX -DISTNAME= le_dico -EXTRACT_SUFX= .tgz +MASTER_SITES= http://homepages.starnet.fr/dtrystram/ +# http://www.montefiore.ulg.ac.be/~geuzaine/BRONNE/WWW/ftp/ le_dico.tgz +# ftp://ftp.supelec.fr/lsi/pub/security/ le_dico.tar.gz +# http://homepages.starnet.fr/dtrystram/ ledico.zip +# http://hpux.cict.fr/ftp/hpux/Text/ dico-1.1/dico-1.1-ss-11.00.tar.gz +DISTNAME= ledico MAINTAINER= cyrille.lefevre@laposte.net -NO_WRKSUBDIR= true -PATCH_STRIP= -p1 +# Global variables +# + +USE_ZIP= true +WRKSRC= ${WRKDIR}/${PORTNAME} USE_AUTOMAKE= true USE_GMAKE= true AUTOMAKE_ARGS= --add-missing --foreign --include-deps MAKE_ARGS= prefix=${PREFIX} MAN1= dico.1 +# Post-patch +# + post-patch: - @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/sources/dico.c + @${PERL} -pi.fbsd -e 's.%%PREFIX%%.${PREFIX}.g' ${WRKSRC}/sources/dico.c + +# Pre-configure +# pre-configure: @cd ${WRKSRC} && ${ACLOCAL} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/textproc/dico/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 10 Mar 2001 17:47:32 -0000 1.1 +++ distinfo 15 Apr 2002 15:35:51 -0000 @@ -1 +1 @@ -MD5 (le_dico.tgz) = df18e084ee2468a0dfc371f752bdbad0 +MD5 (ledico.zip) = 3cd23e5ebf760cac2c8745fe342a86c3 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/textproc/dico/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 10 Mar 2001 17:47:32 -0000 1.1 +++ pkg-plist 15 Apr 2002 16:28:58 -0000 @@ -29,6 +29,6 @@ share/dico/y.dic share/dico/z.dic @dirrm share/dico -share/doc/dico/README.TXT +share/doc/dico/readme.txt share/doc/dico/copying.doc @dirrm share/doc/dico Index: files/patch-Makefile.am =================================================================== RCS file: /home/ncvs/ports/textproc/dico/files/patch-Makefile.am,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile.am --- files/patch-Makefile.am 10 Mar 2001 17:47:32 -0000 1.1 +++ files/patch-Makefile.am 15 Apr 2002 16:10:48 -0000 @@ -1,7 +1,7 @@ ---- old/Makefile.am Thu Jan 1 01:00:00 1970 -+++ new/Makefile.am Wed Oct 11 03:49:06 2000 +--- /dev/null Thu Jan 1 01:00:00 1970 ++++ Makefile.am Wed Oct 11 03:49:06 2000 @@ -0,0 +1,4 @@ +docdir = $(datadir)/doc/dico -+doc_DATA = README.TXT ++doc_DATA = readme.txt + +SUBDIRS = sources lexique manuel Index: files/patch-configure.in =================================================================== RCS file: /home/ncvs/ports/textproc/dico/files/patch-configure.in,v retrieving revision 1.1 diff -u -r1.1 patch-configure.in --- files/patch-configure.in 10 Mar 2001 17:47:32 -0000 1.1 +++ files/patch-configure.in 15 Apr 2002 16:01:21 -0000 @@ -1,5 +1,5 @@ ---- old/configure.in Thu Jan 1 01:00:00 1970 -+++ new/configure.in Wed Oct 11 04:19:05 2000 +--- /dev/null Thu Jan 1 01:00:00 1970 ++++ configure.in Wed Oct 11 04:19:05 2000 @@ -0,0 +1,4 @@ +AC_INIT(sources/dico.c) +AM_INIT_AUTOMAKE(dico, 1.1) Index: files/patch-lexique-Makefile.am =================================================================== RCS file: /home/ncvs/ports/textproc/dico/files/patch-lexique-Makefile.am,v retrieving revision 1.1 diff -u -r1.1 patch-lexique-Makefile.am --- files/patch-lexique-Makefile.am 10 Mar 2001 17:47:32 -0000 1.1 +++ files/patch-lexique-Makefile.am 15 Apr 2002 16:01:33 -0000 @@ -1,5 +1,5 @@ ---- old/lexique/Makefile.am Thu Jan 1 01:00:00 1970 -+++ new/lexique/Makefile.am Wed Oct 11 04:40:58 2000 +--- /dev/null Thu Jan 1 01:00:00 1970 ++++ lexique/Makefile.am Wed Oct 11 04:40:58 2000 @@ -0,0 +1,4 @@ +pkgdata_DATA = a.dic b.dic c.dic d.dic e.dic f.dic g.dic h.dic \ + i.dic j.dic k.dic l.dic m.dic n.dic o.dic p.dic \ Index: files/patch-manuel-Makefile.am =================================================================== RCS file: /home/ncvs/ports/textproc/dico/files/patch-manuel-Makefile.am,v retrieving revision 1.1 diff -u -r1.1 patch-manuel-Makefile.am --- files/patch-manuel-Makefile.am 10 Mar 2001 17:47:33 -0000 1.1 +++ files/patch-manuel-Makefile.am 15 Apr 2002 16:03:03 -0000 @@ -1,5 +1,5 @@ ---- old/manuel/Makefile.am Thu Jan 1 01:00:00 1970 -+++ new/manuel/Makefile.am Wed Oct 11 03:46:58 2000 +--- /dev/null Thu Jan 1 01:00:00 1970 ++++ manuel/Makefile.am Wed Oct 11 03:46:58 2000 @@ -0,0 +1,7 @@ +docdir = $(datadir)/doc/dico +doc_DATA = copying.doc Index: files/patch-sources-Makefile.am =================================================================== RCS file: /home/ncvs/ports/textproc/dico/files/patch-sources-Makefile.am,v retrieving revision 1.1 diff -u -r1.1 patch-sources-Makefile.am --- files/patch-sources-Makefile.am 10 Mar 2001 17:47:33 -0000 1.1 +++ files/patch-sources-Makefile.am 15 Apr 2002 16:03:11 -0000 @@ -1,4 +1,4 @@ ---- old/sources/Makefile.am Thu Jan 1 01:00:00 1970 -+++ new/sources/Makefile.am Wed Oct 11 03:35:13 2000 +--- /dev/null Thu Jan 1 01:00:00 1970 ++++ sources/Makefile.am Wed Oct 11 03:35:13 2000 @@ -0,0 +1 @@ +bin_PROGRAMS = dico Index: files/patch-sources-dico.c =================================================================== RCS file: /home/ncvs/ports/textproc/dico/files/patch-sources-dico.c,v retrieving revision 1.1 diff -u -r1.1 patch-sources-dico.c --- files/patch-sources-dico.c 10 Mar 2001 17:47:33 -0000 1.1 +++ files/patch-sources-dico.c 15 Apr 2002 16:09:17 -0000 @@ -1,16 +1,14 @@ ---- old/sources/dico.c Thu Mar 27 14:57:57 1997 -+++ new/sources/dico.c Wed Oct 11 04:04:49 2000 -@@ -19,8 +19,8 @@ +--- sources/dico.c.orig Sat Oct 24 16:16:30 1992 ++++ sources/dico.c Mon Apr 15 18:09:04 2002 +@@ -19,6 +19,7 @@ | | +-----------------------------------------------------------------------+ */ --#define LINUX - +#ifndef __FreeBSD__ #ifndef LINUX #ifndef sony #ifndef MSDOS -@@ -28,6 +28,7 @@ +@@ -26,6 +27,7 @@ #endif #endif #endif @@ -18,7 +16,7 @@ #ifdef sony /* Sony News WorkStations */ #define UNIX -@@ -42,6 +43,12 @@ +@@ -40,6 +42,12 @@ #define MYOS "LINUX" #endif @@ -31,20 +29,16 @@ #ifdef MSDOS /* Systeme d'operation de disque */ #define MYOS "MSDOS" /* Microsoft :-) */ #endif -@@ -51,8 +58,11 @@ +@@ -49,7 +57,7 @@ #define ISO_TERM 3 #define COMMENT_CHAR 35 /* '#' ligne de commentaire */ --#define DICT_PATH "/usr/local/lib/dico" /* path par defaut unix/dos */ -+#ifndef MSDOS -+#define DICT_PATH "!!PREFIX!!/share/dico" /* path par defaut unix/dos */ -+#else +-#define DICT_PATH "/usr/local/lib/dico" /* path par defaut unix/dos */ ++#define DICT_PATH "%%PREFIX%%/share/dico" /* path par defaut unix/dos */ #define DOS_PATH "lexique" /* path par defaut Dos uniquement */ -+#endif #define DICT_EXT ".dic" /* extension des fichiers dicos */ #define VERSION_FILE "version.dic" /* fichier texte version dico */ - -@@ -60,11 +70,13 @@ +@@ -58,11 +66,13 @@ #define OK 0 #define MYVBUF 10240 /* pour setvbuf() eventuel */ @@ -58,7 +52,7 @@ typedef unsigned char byte; -@@ -147,7 +159,9 @@ +@@ -145,7 +155,9 @@ if(argv[1][0] =='-') /* option ligne commande?*/ return options( argv[1][1] ); @@ -68,7 +62,7 @@ while( --argc) /* Allez, roulez ! */ { -@@ -157,7 +171,9 @@ +@@ -155,7 +167,9 @@ lookfor( argv[argc] ); } @@ -78,7 +72,7 @@ return OK ; } -@@ -369,7 +385,9 @@ +@@ -367,7 +381,9 @@ StrLwr( pattern ); /* passe en minuscules comme le dico */ car = equival (pattern[0]); @@ -88,7 +82,7 @@ sprintf(fname, "%s%s%c%s", dict_path, sep, pattern[0], DICT_EXT ) ; -@@ -395,7 +413,11 @@ +@@ -393,7 +409,11 @@ if( fmatch(sbuf,pattern) ) { translate( buf ); /* gere terminaux.... */ @@ -100,7 +94,7 @@ count ++ ; } } -@@ -451,8 +473,11 @@ +@@ -449,8 +469,11 @@ if( fmatch(sbuf,pattern) ) { translate( buf ) ; @@ -113,22 +107,13 @@ count ++ ; } } -@@ -474,7 +499,7 @@ - - mybanner() - { --/* printf("\nDICO V %s (%s) - R.Cougnenc 1992\n\n", __Version__, MYOS);*/ -+ printf("\nDICO V %s (%s) - R.Cougnenc 1992\n\n", __Version__, MYOS); - } - /*--------------------------------------------------------------------------*/ - -@@ -526,7 +551,9 @@ +@@ -524,7 +547,9 @@ byte ville[50], code[6]; byte *r = ville; -+/* #ifndef __FreeBSD__ */ ++#ifndef __FreeBSD__ *str = ToUpper ( *str ); /* Premiere lettre... */ -+/* #endif */ ++#endif if( ! strchr( str, '\t') ) /* Cas du nom commun */ { >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204151638.g3FGcTl28338>