Date: Sat, 29 Jan 2000 14:57:00 +0100 (CET) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16450: textproc/ispell fix Message-ID: <200001291357.OAA77042@home.dinoex.sub.org>
next in thread | raw e-mail | index | archive | help
>Number: 16450
>Category: ports
>Synopsis: textproc/ispell fix
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 29 09:50:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Dirk Meyer
>Release: FreeBSD 3.3-RELEASE i386
>Organization:
privat
>Environment:
%
>Description:
build ispell for with extra dictionaries
The port use an makefile copied into the workdir.
>How-To-Repeat:
The port use an makefile copied into the workdir.
cat echo mkdir is now replaced by the recommended macros.
Some portlint complains have been fixed.
>Fix:
this patches make it obsolete,
and future changes more easier
diff ispell/Makefile ispell/Makefile
--- ispell/Makefile Sat Jan 29 13:15:02 2000
+++ ispell/Makefile Sat Jan 29 14:51:53 2000
@@ -27,7 +27,9 @@
MLINKS= ispell.1 buildhash.1 ispell.1 findaffix.1 ispell.1 munchlist.1\
ispell.1 tryaffix.1 sq.1 unsq.1
EXTRACT_ONLY= ${ISPELL_FILES}
-EXTRA_DICT=
+EXTRA_DICT=
+BUILDHASH=${WRKSRC}/buildhash
+DATADIR=${PREFIX}/share/ispell
.if (!defined(ISPELL_FR) && !defined (ISPELL_SE) && !defined(ISPELL_BR) && !defined(ISPELL_DENEU) && !defined(ISPELL_DEALT) && !defined(ISPELL_LANG))
.if (make(patch) || make(configure) || make(build) || make (install))
@@ -54,7 +56,7 @@
.endif
.if defined(ISPELL_SE)
SEDISTFILE= iswedish-1.2.1.tar.gz
-MASTER_SITES+= http://www.sslug.dk/locale/ispell/iswedish/
+MASTER_SITES+= http://www.sslug.dk/locale/ispell/iswedish/
EXTRA_DICT+= ${SEDISTFILE}
EXTRACT_ONLY+= ${SEDISTFILE}
.endif
@@ -69,7 +71,7 @@
EXTRA_DICT+= ${DENEUDISTFILE}
EXTRACT_ONLY+= ${DENEUDISTFILE}
MASTER_SITES+= http://members.xoom.com/maccy/ispell/dict/ \
- ftp://student.physik.uni-dortmund.de/pub/users/jacke/ispell/
+ ftp://student.physik.uni-dortmund.de/pub/users/jacke/ispell/
FETCH_BEFORE_ARGS+= -b # HTTP Workaround at Xoom
.endif
.if defined(ISPELL_DEALT)
@@ -88,15 +90,14 @@
post-extract:
.if defined(ISPELL_FR)
- @${MKDIR} -p ${WRKDIR}/francais-IREQ
+ @${MKDIR} ${WRKDIR}/francais-IREQ
@${TAR} -C ${WRKDIR}/francais-IREQ -zxf ${PORTSDIR}/distfiles/${FRDISTFILE}
.endif
.if defined(ISPELL_DEALT)
- -@${MKDIR} ${WRKDIR}/hk-deutsch
+ @${MKDIR} ${WRKDIR}/hk-deutsch
@${TAR} -C ${WRKDIR}/hk-deutsch/ -zxf ${PORTSDIR}/distfiles/${DEALTDISTFILE}
.endif
@${TOUCH} ${WRKSRC}/dummy
- @${CP} ${FILESDIR}/Makefile ${WRKDIR}/Makefile
post-patch:
.if defined(ISPELL_FR)
@@ -116,31 +117,69 @@
post-configure:
@${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
-do-build:
- @(cd ${WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} WRKSRC=${WRKSRC} ${ALL_TARGET})
+post-build:
+.if defined(ISPELL_DENEU)
+ @cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.gz==} && \
+ ${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} german.hash
+.endif
+.if defined(ISPELL_DEALT)
+ @cd ${WRKDIR}/${DEALTDISTFILE:S=.tar.gz==} && \
+ ${CAT} worte.txt verben.txt \
+ adjektive.txt klein.txt geographie.txt vornamen.txt \
+ abkuerz.txt imperat.txt latein.txt informatik.txt \
+ infoabk.txt elektronik.txt orgabk.txt marken.txt \
+ alphabeta.txt roemisch.txt zusammen.txt | \
+ sort -u > all.words && \
+ ${BUILDHASH} all.words deutsch.aff deutsch.hash
+.endif
+.if defined(ISPELL_BR)
+ @cd ${WRKDIR}/${BRDISTFILE:S=.tar.gz==} && \
+ ${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} hash
+.endif
+.if defined(ISPELL_SE)
+ @cd ${WRKDIR}/${SEDISTFILE:S=.tar.gz==} && \
+ ${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
+.endif
+.if defined(ISPELL_FR)
+ @cd ${WRKDIR}/francais-IREQ && \
+ ${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
+.endif
-do-install:
- @(cd ${WRKDIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} WRKSRC=${WRKSRC} ${INSTALL_TARGET})
+pre-install:
+ if [ ! -d ${DATADIR} ]; \
+ then ${MKDIR} ${DATADIR}; fi
post-install:
+ -install -c -m 644 *.aff *.hash ${DATADIR}/DATADIR/ispell
@[ -e ${WRKDIR}/.british-build ] && \
- cat ${.CURDIR}/pkg/PLIST.BRITISH >> ${TMPPLIST} || \
- cat ${.CURDIR}/pkg/PLIST.AM >> ${TMPPLIST}
-.if defined(ISPELL_FR)
- @cat ${.CURDIR}/pkg/PLIST.FR >> ${TMPPLIST}
+ ${CAT} ${PKGDIR}/PLIST.BRITISH >> ${TMPPLIST} || \
+ ${CAT} ${PKGDIR}/PLIST.AM >> ${TMPPLIST}
+.if defined(ISPELL_DENEU)
+ @cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.gz==} && \
+ ${INSTALL_DATA} german.aff ${DATADIR}/ndeutsch.aff && \
+ ${INSTALL_DATA} german.hash ${DATADIR}/ndeutsch.hash
+ @${CAT} ${PKGDIR}/PLIST.DENEU >> ${TMPPLIST}
.endif
.if defined(ISPELL_DEALT)
- @cat ${.CURDIR}/pkg/PLIST.DEALT >> ${TMPPLIST}
-.endif
-.if defined(ISPELL_DENEU)
- @cat ${.CURDIR}/pkg/PLIST.DENEU >> ${TMPPLIST}
+ @cd ${WRKDIR}/${DEALTDISTFILE:S=.tar.gz==} && \
+ ${INSTALL_DATA} deutsch.aff deutsch.hash ${DATADIR}
+ @${CAT} ${PKGDIR}/PLIST.DEALT >> ${TMPPLIST}
.endif
.if defined(ISPELL_BR)
- @cat ${.CURDIR}/pkg/PLIST.BR >> ${TMPPLIST}
+ @cd ${WRKDIR}/${BRDISTFILE:S=.tar.gz==} && \
+ ${INSTALL_DATA} br.aff br.hash ${DATADIR}
+ @${CAT} ${PKGDIR}/PLIST.BR >> ${TMPPLIST}
.endif
.if defined(ISPELL_SE)
- @cat ${.CURDIR}/pkg/PLIST.SE >> ${TMPPLIST}
+ @cd ${WRKDIR}/${SEDISTFILE:S=.tar.gz==} && \
+ ${INSTALL_DATA} svenska.aff svenska.hash ${DATADIR}
+ @${CAT} ${PKGDIR}/PLIST.SE >> ${TMPPLIST}
+.endif
+.if defined(ISPELL_FR)
+ @cd ${WRKDIR}/francais-IREQ && \
+ ${INSTALL_DATA} francais.aff francais.hash ${DATADIR}
+ @${CAT} ${PKGDIR}/PLIST.FR >> ${TMPPLIST}
.endif
- @echo "@dirrm share/ispell" >> ${TMPPLIST}
-
+ @${ECHO} "@dirrm share/ispell" >> ${TMPPLIST}
+
.include <bsd.port.mk>
diff ispell/files/Makefile ispell/files/Makefile
--- ispell/files/Makefile Sat Jan 22 23:26:03 2000
+++ ispell/files/Makefile Thu Jan 1 01:00:00 1970
@@ -1,58 +0,0 @@
-#
-# $FreeBSD: ports/textproc/ispell/files/Makefile,v 1.1 2000/01/22 22:26:03 jmz Exp $
-#
-
-BUILDHASH=${WRKSRC}/buildhash
-
-all: ispell
-.if defined(ISPELL_DENEU)
- @make DENEU;
-.endif
-.if defined(ISPELL_DEALT)
- @make DEALT;
-.endif
-.if defined(ISPELL_BR)
- @make BR;
-.endif
-.if defined(ISPELL_SE)
- @make SE;
-.endif
-.if defined(ISPELL_FR)
- @make FR;
-.endif
-
-DENEU:
- @cd ./igerman* && make BUILDHASH=${BUILDHASH} german.hash
-
-DEALT:
- @cd hk-deutsch && cat worte.txt verben.txt \
- adjektive.txt klein.txt geographie.txt vornamen.txt \
- abkuerz.txt imperat.txt latein.txt informatik.txt \
- infoabk.txt elektronik.txt orgabk.txt marken.txt \
- alphabeta.txt roemisch.txt zusammen.txt \
- | sort -u > all.words \
- && ${BUILDHASH} all.words deutsch.aff deutsch.hash
-
-BR:
- @cd ./`echo ${BRDISTFILE} | sed -e 's/\.tar\.gz$$//g'` && make BUILDHASH=${BUILDHASH} hash
-
-SE:
- @cd ./`echo ${SEDISTFILE} | sed -e 's/\.tar.gz\$$//g'` && make BUILDHASH=${BUILDHASH}
-
-FR:
- @cd ./francais-IREQ/ && make BUILDHASH=${BUILDHASH}
-
-install: install-ispell
- -cp */*.aff */*.hash .
-.if defined(ISPELL_DENEU)
- @mv german.aff ndeutsch.aff
- @mv german.hash ndeutsch.hash
-.endif
- -install -c -m 644 *.aff *.hash ${PREFIX}/share/ispell
-
-ispell:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} all
-
-install-ispell: ispell
- if [ ! -d ${PREFIX}/share/ispell ]; then mkdir ${PREFIX}/share/ispell; fi
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install
>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?200001291357.OAA77042>