aboutsummaryrefslogtreecommitdiffstats
path: root/french
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2004-03-13 05:53:29 +0800
committernaddy <naddy@FreeBSD.org>2004-03-13 05:53:29 +0800
commit8a690fadf4d652527efc5df0dfdf83a3fd51e2cb (patch)
treec63e92e01b1002075aa416d866c7259f2ba3e34c /french
parent36046d813419838121a9b6d11028093291c79dd8 (diff)
downloadfreebsd-ports-gnome-8a690fadf4d652527efc5df0dfdf83a3fd51e2cb.tar.gz
freebsd-ports-gnome-8a690fadf4d652527efc5df0dfdf83a3fd51e2cb.tar.zst
freebsd-ports-gnome-8a690fadf4d652527efc5df0dfdf83a3fd51e2cb.zip
Lots of clean-up:
* EXTRACT_CMD added * *_SUB added * delete %%DOCSDIR%% if NOPORTDOC * pkg-plist sorted * code linted PR: 64021 Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>
Diffstat (limited to 'french')
-rw-r--r--french/dico/Makefile15
-rw-r--r--french/dico/files/patch-sources-dico.c256
-rw-r--r--french/dico/pkg-plist2
3 files changed, 256 insertions, 17 deletions
diff --git a/french/dico/Makefile b/french/dico/Makefile
index 0c7aa94fbfb7..556de2020c25 100644
--- a/french/dico/Makefile
+++ b/french/dico/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dico
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://homepages.starnet.fr/dtrystram/
# http://www.montefiore.ulg.ac.be/~geuzaine/BRONNE/WWW/ftp/ le_dico.tgz
@@ -26,18 +26,21 @@ BROKEN_WWW= http://www.montefiore.ulg.ac.be/cgi-bin-ulg/DICO.html
USE_REINPLACE= true
USE_ZIP= true
+EXTRACT_CMD= UNZIP= unzip
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOMAKE= true
USE_GMAKE= true
AUTOMAKE_ARGS= --add-missing --foreign --include-deps
MAKE_ARGS= prefix=${PREFIX}
MAN1= dico.1
+REINPLACE_SUB= PREFIX=${PREFIX}
# Post-patch
#
post-patch:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/sources/dico.c
+ @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${WRKSRC}/sources/dico.c
# Pre-configure
#
@@ -45,4 +48,12 @@ post-patch:
pre-configure:
@cd ${WRKSRC} && ${ACLOCAL}
+# Post-install
+#
+
+post-install:
+.if defined(NOPORTDOCS)
+ @${RM} -rf ${DOCSDIR}
+.endif
+
.include <bsd.port.mk>
diff --git a/french/dico/files/patch-sources-dico.c b/french/dico/files/patch-sources-dico.c
index db23626d98b2..82849cd446b9 100644
--- a/french/dico/files/patch-sources-dico.c
+++ b/french/dico/files/patch-sources-dico.c
@@ -1,5 +1,5 @@
--- sources/dico.c.orig Sat Oct 24 16:16:30 1992
-+++ sources/dico.c Mon Apr 15 18:09:04 2002
++++ sources/dico.c Fri Mar 12 22:01:31 2004
@@ -19,6 +19,7 @@
| |
+-----------------------------------------------------------------------+
@@ -52,7 +52,48 @@
typedef unsigned char byte;
-@@ -145,7 +155,9 @@
+@@ -78,14 +88,28 @@
+ byte *StrUpr ( byte *str);
+ byte *StrLwr ( byte *str);
+ byte *StrAscii( byte *str);
++void translate( byte *str );
+ byte equival( byte c );
+-byte *beautify( byte *str);
+-void lookfor();
+-void lookall();
++char *beautify(char *);
++void lookfor(byte *);
++void lookall(byte *);
+ #ifdef MSDOS
+ void GetDosPath(char *path);
+ void TakePath (char *path);
+ #endif
++void file_usage(void);
++int usage(void);
++int options(int);
++int isjoker(int);
++void mybanner(void);
++int countwords(void);
++void nolf(char *);
++int fmatch(char *_fname, char *_pat);
++int match(char *_fname, char *_pat);
++void StrIBM(byte *);
++void StrISO(byte *);
++void iso2ibm(unsigned char *);
++void ibm2iso(unsigned char *);
+
+ #ifdef MSDOS
+ char *sep = "\\";
+@@ -111,7 +135,7 @@
+ /*
+ * Code...
+ */
+-
++int
+ main( int argc, char **argv )
+ {
+ char *dic,*term ;
+@@ -145,17 +169,21 @@
if(argv[1][0] =='-') /* option ligne commande?*/
return options( argv[1][1] );
@@ -62,8 +103,12 @@
while( --argc) /* Allez, roulez ! */
{
-@@ -155,7 +167,9 @@
- lookfor( argv[argc] );
+ if( isjoker (argv[argc][0] ) )
+- lookall( argv[argc] );
++ lookall( (byte *)argv[argc] );
+ else
+- lookfor( argv[argc] );
++ lookfor( (byte *)argv[argc] );
}
+#ifndef __FreeBSD__
@@ -72,20 +117,82 @@
return OK ;
}
-@@ -367,7 +381,9 @@
-
+@@ -169,7 +197,7 @@
+ *
+ *
+ */
+-
++void
+ file_usage()
+ {
+ #ifndef MSDOS /* Cas normal */
+@@ -211,6 +239,7 @@
+ *
+ *
+ */
++int
+ usage()
+ {
+ fprintf(stderr,"\n\nDico - R.Cougnenc 1992 - Recherche dans lexique ");
+@@ -251,13 +280,14 @@
+ * Pour l'instant, il n'y en que deux :-)
+ *
+ */
+-options( char *c )
++int
++options( int c )
+ {
+ char fname[127] ;
+ char buf[80];
+ FILE *fp ;
+
+- switch ( (int) c )
++ switch ( c )
+ {
+ case 'v': /* Affiche la date mise a jour dico, fichier version.dic */
+
+@@ -296,6 +326,7 @@
+ *
+ *
+ */
++ int
+ countwords()
+ {
+ char fname[127];
+@@ -357,17 +388,20 @@
+ * de l'expression pattern.
+ */
+ void
+-lookfor ( char *pattern )
++lookfor ( byte *pattern )
+ {
+ FILE *fp ;
+ char fname[127];
+ char buf[80];
+ char sbuf[80];
+- byte car ;
+-
++#ifndef __FreeBSD__
++ byte car;
++#endif
StrLwr( pattern ); /* passe en minuscules comme le dico */
- car = equival (pattern[0]);
+#ifndef __FreeBSD__
+ car = equival (pattern[0]);
fprintf(stderr, "Recherche %s dans la lettre %c... \n\n", pattern, car) ;
+#endif
sprintf(fname, "%s%s%c%s", dict_path, sep, pattern[0], DICT_EXT ) ;
-@@ -393,7 +409,11 @@
+@@ -389,11 +423,15 @@
+ continue ;
+ nolf( buf ); /* supprime le line-feed */
+ strcpy( sbuf, buf ); /* No accent sensitive */
+- StrAscii( sbuf);
++ StrAscii((byte *)sbuf);
if( fmatch(sbuf,pattern) )
{
- translate( buf ); /* gere terminaux.... */
+- translate( buf ); /* gere terminaux.... */
++ translate( (byte *)buf ); /* gere terminaux.... */
+#ifndef __FreeBSD__
printf("\t%s\n", beautify(buf) );
+#else
@@ -94,11 +201,26 @@
count ++ ;
}
}
-@@ -449,8 +469,11 @@
+@@ -410,7 +448,7 @@
+ *
+ */
+ void
+-lookall ( char *pattern )
++lookall ( byte *pattern )
+ {
+ FILE *fp ;
+ char fname[127];
+@@ -445,12 +483,15 @@
+ continue ;
+ nolf( buf ); /* supprime le line-feed */
+ strcpy( sbuf, buf); /* no accent sensitive */
+- StrAscii( sbuf);
++ StrAscii((byte *)sbuf);
if( fmatch(sbuf,pattern) )
{
- translate( buf ) ;
+- translate( buf ) ;
- buf[0] = ToUpper( buf[0] ) ;
++ translate( (byte *)buf ) ;
+#ifndef __FreeBSD__
printf("\t%s\n", beautify (buf) );
+#else
@@ -107,9 +229,40 @@
count ++ ;
}
}
-@@ -524,7 +547,9 @@
- byte ville[50], code[6];
- byte *r = ville;
+@@ -469,7 +510,7 @@
+ *
+ *
+ */
+-
++void
+ mybanner()
+ {
+ printf("\nDICO V %s (%s) - R.Cougnenc 1992\n\n", __Version__, MYOS);
+@@ -484,7 +525,8 @@
+ * et modifie buf en consequence.
+ *
+ */
+-translate( char * buf)
++void
++translate( byte * buf)
+ {
+ switch ( myterm )
+ {
+@@ -517,14 +559,16 @@
+ * STATIQUE, ecrasee a chaque appel, contenant le
+ * joli resultat :-)
+ */
+-byte *
+-beautify ( byte * str )
++char *
++beautify ( char * str )
+ {
+- static byte result[ 80 ];
+- byte ville[50], code[6];
+- byte *r = ville;
++ static char result[ 80 ];
++ char ville[50], code[6];
++ char *r = ville;
+#ifndef __FreeBSD__
*str = ToUpper ( *str ); /* Premiere lettre... */
@@ -117,3 +270,78 @@
if( ! strchr( str, '\t') ) /* Cas du nom commun */
{
+@@ -559,6 +603,7 @@
+ * un debut d'expressions regulieres.
+ *
+ */
++int
+ isjoker( int c )
+ {
+ switch( c )
+@@ -580,6 +625,7 @@
+ * nolf: Supprime un line feed a la fin d'une chaine.
+ *
+ */
++void
+ nolf( char *str)
+ {
+ while( *str )
+@@ -604,7 +650,6 @@
+
+
+ #define MATCH 1
+-int match(char *_fname, char *_pat);
+
+ int fmatch(char *_fname, char *_pat)
+ {
+@@ -627,7 +672,7 @@
+ return(match(fname, pat + -1));
+ }
+
+-
++int
+ match(char *_fname, char *_pat)
+ {
+ register char *pat, *fname;
+@@ -766,6 +811,7 @@
+ *
+ *
+ */
++void
+ StrIBM ( byte *str )
+ {
+ while ( *str )
+@@ -782,6 +828,7 @@
+ *
+ *
+ */
++void
+ StrISO ( byte *str )
+ {
+ while ( *str )
+@@ -862,11 +909,13 @@
+ 0xb2,0xa4,0x20
+ };
+
++void
+ iso2ibm( unsigned char *c )
+ {
+ *c = IsoTable[ *c ] ;
+ }
+
++void
+ ibm2iso( unsigned char *c )
+ {
+ *c = TableIso[ *c ] ;
+@@ -965,9 +1014,9 @@
+ {
+ byte *p = str ;
+
+- while (*str)
++ for (;*str;str++)
+ {
+- *str = EquivalTable[ *str++ ] ;
++ *str = EquivalTable[ *str ] ;
+ }
+
+ return p ;
diff --git a/french/dico/pkg-plist b/french/dico/pkg-plist
index cd1e9707319f..40620e60971e 100644
--- a/french/dico/pkg-plist
+++ b/french/dico/pkg-plist
@@ -28,6 +28,6 @@ bin/dico
%%DATADIR%%/y.dic
%%DATADIR%%/z.dic
@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/copying.doc
%%PORTDOCS%%%%DOCSDIR%%/README.TXT
+%%PORTDOCS%%%%DOCSDIR%%/copying.doc
%%PORTDOCS%%@dirrm %%DOCSDIR%%