ports/121902: [PATCH] textproc/ispell add OPTIONS

Martin Matuska mm at FreeBSD.org
Thu Mar 20 11:30:12 UTC 2008 

>Number:         121902
>Category:       ports
>Synopsis:       [PATCH] textproc/ispell add OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 20 11:30:11 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 7.0-RELEASE i386 and amd64
>Organization:
>Environment:
System: FreeBSD 7.0-RELEASE i386 and amd64
>Description:
- add OPTIONS for ispell dictionaries
- retain compatibility with old ISPELL_* flags
>How-To-Repeat:
>Fix:
Index: ports/textproc/ispell/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/ispell/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- ports/textproc/ispell/Makefile	19 Mar 2008 20:46:14 -0000	1.109
+++ ports/textproc/ispell/Makefile	20 Mar 2008 11:21:52 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME?=	ispell
 PORTVERSION?=	3.2.06
-PORTREVISION?=	20
+PORTREVISION?=	21
 CATEGORIES+=	textproc
 MASTER_SITES=	http://fmg-www.cs.ucla.edu/geoff/tars/ \
 		http://distfiles.opendarwin.org/
@@ -38,74 +38,80 @@
 DATADIR=	${PREFIX}/share/ispell
 ISPELL=		${WRKSRC}/ispell
 
-.if (!defined(ISPELL_IT) && !defined(ISPELL_FR) && !defined(ISPELL_SE) && !defined(ISPELL_BR) && !defined(ISPELL_DENEU) && !defined(ISPELL_DEALT) && !defined(ISPELL_BRITISH) && !defined(ISPELL_NO) && !defined(ISPELL_NL) && !defined(ISPELL_DA) && !defined(ISPELL_AF) && !defined(ISPELL_FI) && !defined(ISPELL_PL) && !defined(ISPELL_BG) && !defined(ISPELL_SK) && !defined(ISPELL_CS))
+OPTIONS+=	ISPELL_BRITISH "British English dictionary" OFF \
+		ISPELL_AMERICAN "British and American English dictionary" OFF \
+		ISPELL_BR "Brazilian Portuguese dictionary" OFF \
+		ISPELL_BG "Bulgarian dictionary" OFF \
+		ISPELL_CS "Czech dictionary" OFF \
+		ISPELL_NL "Dutch dictionary" OFF \
+		ISPELL_DA "Danish dictionary" OFF \
+		ISPELL_FI "Finnish dictionary" OFF \
+		ISPELL_FR "French dictionary" OFF \
+		ISPELL_DEALT "German dictionary (old spelling)" OFF \
+		ISPELL_DENEU "German dictionary (new spelling)" OFF \
+		ISPELL_IT "Italian dictionary" OFF \
+		ISPELL_PL "Polish dictionary" OFF \
+		ISPELL_SK "Slovak dictionary" OFF \
+		ISPELL_SE "Swedish dictionary" OFF \
+		ISPELL_NO "Norwegian dictionary" OFF
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ISPELL_FI) && !defined(ISPELL_FI)
 pre-everything::
 	@${ECHO_MSG} '*********************************************************'
-	@${ECHO_MSG} '* You can add further dictionaries:                     *'
-	@${ECHO_MSG} '*                              Use make-flag:           *'
-#	@${ECHO_MSG} '*  - Afrikaans                 ISPELL_AF=yes            *'
-	@${ECHO_MSG} '*  - British                   ISPELL_BRITISH=yes       *'
-	@${ECHO_MSG} '*    (replaces the American dictionary, specify also    *'
-	@${ECHO_MSG} '*     ISPELL_INCLAMERICAN=yes to have both)             *'
-	@${ECHO_MSG} '*  - Brazilian Portuguese      ISPELL_BR=yes            *'
-	@${ECHO_MSG} '*  - Bulgarian                 ISPELL_BG=yes            *'
-	@${ECHO_MSG} '*  - Czech                     ISPELL_CS=yes            *'
-	@${ECHO_MSG} '*  - Dutch                     ISPELL_NL=yes            *'
-	@${ECHO_MSG} '*  - Danish                    ISPELL_DA=yes            *'
-	@${ECHO_MSG} '*  - Finnish                   ISPELL_FI=yes            *'
+	@${ECHO_MSG} '* You can additionally define the finnish dictionary    *'
+	@${ECHO_MSG} '* size:                                                 *'
+	@${ECHO_MSG} '*                                                       *'
+	@${ECHO_MSG} '*  ISPELL_FI=[small|large] (medium is default)          *'
 	@${ECHO_MSG} '*    (or ISPELL_FI=[small|large] (medium is default)    *'
-	@${ECHO_MSG} '*  - French                    ISPELL_FR=yes            *'
-	@${ECHO_MSG} '*  - German (old spelling)     ISPELL_DEALT=yes         *'
-	@${ECHO_MSG} '*  - German (new spelling)     ISPELL_DENEU=yes         *'
-	@${ECHO_MSG} '*  - Italian                   ISPELL_IT=yes            *'
-	@${ECHO_MSG} '*  - Polish                    ISPELL_PL=yes            *'
-	@${ECHO_MSG} '*  - Slovak                    ISPELL_SK=yes            *'
-	@${ECHO_MSG} '*  - Swedish                   ISPELL_SE=yes            *'
-	@${ECHO_MSG} '*  - Norwegian                 ISPELL_NO=yes            *'
-	@${ECHO_MSG} '* Example: "make ISPELL_FR=yes ISPELL_SE=yes install"   *'
+	@${ECHO_MSG} '*                                                       *'
+	@${ECHO_MSG} '* Example: "make ISPELL_FI=large install"               *'
 	@${ECHO_MSG} '*********************************************************'
-.else
-.if defined(ISPELL_BRITISH)
-SCRIPTS_ENV+=	ISPELL_BRITISH=${ISPELL_BRITISH}
-.if defined(ISPELL_INCLAMERICAN)
-SCRIPTS_ENV+=	ISPELL_INCLAMERICAN=${ISPELL_INCLAMERICAN}
 .endif
+
+.if defined(WITH_ISPELL_BRITISH) || defined(ISPELL_BRITISH)
+SCRIPTS_ENV+=	ISPELL_BRITISH=yes
+.if defined(WITH_ISPELL_AMERICAN) || defined(ISPELL_INCLAMERICAN)
+SCRIPTS_ENV+=	ISPELL_INCLAMERICAN=yes
 .endif
-.if defined(ISPELL_IT)
+.endif
+
+.if defined(WITH_ISPELL_IT) || defined(ISPELL_IT)
 ITDISTFILE=	ispell-it2001.tgz
 MASTER_SITES+=	http://members.xoom.virgilio.it/trasforma/ispell/:it
 EXTRA_DICT+=	${ITDISTFILE}:it
 .endif
-.if defined(ISPELL_FR)
+.if defined(WITH_ISPELL_FR) || defined(ISPELL_FR)
 FRDISTFILE=	francais-IREQ-1.4.tar.gz
 MASTER_SITES+=	ftp://ftp.lip6.fr/pub/ispell/francais/:fr
 EXTRA_DICT+=	${FRDISTFILE}:fr
 .endif
-.if defined(ISPELL_SE)
+.if defined(WITH_ISPELL_SE) || defined(ISPELL_SE)
 SEDISTFILE=	iswedish-1.2.1.tar.gz
 MASTER_SITES+=	http://www.sslug.dk/locale/ispell/iswedish/:se
 EXTRA_DICT+=	${SEDISTFILE}:se
 EXTRACT_ONLY+=	${SEDISTFILE}
 .endif
-.if defined(ISPELL_BR)
+.if defined(WITH_ISPELL_BR) || defined(ISPELL_BR)
 BROKEN=		ispell-br unfetchable
 BRDISTFILE=	br.ispell-2.4.tar.gz
 MASTER_SITES+=	ftp://ftp.ime.usp.br/pub/ueda/br.ispell/:br
 EXTRA_DICT+=	${BRDISTFILE}:br
 EXTRACT_ONLY+=	${BRDISTFILE}
 .endif
-.if defined(ISPELL_DENEU)
+.if defined(WITH_ISPELL_DENEU) || defined(ISPELL_DENEU)
 BROKEN=		igerman98-20071211/Makefile must be patched
 DENEUDISTFILE=	igerman98-20071211.tar.bz2
 MASTER_SITES+=	http://www.j3e.de/ispell/igerman98/dict/:denu
 EXTRA_DICT+=	${DENEUDISTFILE}:denu
 .endif
-.if defined(ISPELL_DEALT)
+.if defined(WITH_ISPELL_DEALT) || defined(ISPELL_DEALT)
 DEALTDISTFILE=	hk-deutsch.tar.gz
 MASTER_SITES+=	ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/:dealt
 EXTRA_DICT+=	${DEALTDISTFILE}:dealt
 .endif
-.if defined(ISPELL_NO)
+.if defined(WITH_ISPELL_NO) || defined(ISPELL_NO)
 BROKEN=		ispell-no unfetchable
 NODISTFILE=	ispell-norsk-2.0.tar.gz
 MASTER_SITES+=	http://folk.uio.no/runekl/:no
@@ -114,14 +120,14 @@
 MASKBITS?=	64
 USE_GMAKE=	yes
 .endif
-.if defined(ISPELL_NL)
+.if defined(WITH_ISPELL_NL) || defined(ISPELL_NL)
 NLDISTFILE=	ispell-nl-1.0.0.tar.gz
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:nl/}
 MASTER_SITE_SUBDIR+=	fenner/:nl
 EXTRA_DICT+=	${NLDISTFILE}:nl
 EXTRACT_ONLY+=	${NLDISTFILE}
 .endif
-.if defined(ISPELL_DA)
+.if defined(WITH_ISPELL_DA) || defined(ISPELL_DA)
 DADISTFILE=	ispell-da-1.7.18.tar.gz
 MASTER_SITES+=	http://da.speling.org/filer/:da \
 		${MASTER_SITE_LOCAL:S/$/:da/}
@@ -129,13 +135,13 @@
 EXTRA_DICT+=	${DADISTFILE}:da
 EXTRACT_ONLY+=	${DADISTFILE}
 .endif
-#.if defined(ISPELL_AF)
+#.if defined(WITH_ISPELL_AF) || defined(ISPELL_AF)
 #AFDISTFILE=	ispell-sa-1.0.0.tar.gz
 #MASTER_SITES+=	#${MASTER_SITE_LOCAL:S/$/:af/}
 #EXTRA_DICT+=	${AFDISTFILE}:af
 #EXTRACT_ONLY+=	${AFDISTFILE}
 #.endif
-.if defined(ISPELL_FI)
+.if defined(WITH_ISPELL_FI) || defined(ISPELL_FI)
 FIDICTFILE=	finnish.dict.bz2
 MASTER_SITES+=	http://ispell-fi.sourceforge.net/:fi
 .if ${ISPELL_FI:L} != yes
@@ -145,7 +151,7 @@
 .endif
 EXTRA_DICT+=	${FIDICTFILE}:fi ${FIAFFIXFILE}:fi
 .endif
-.if defined(ISPELL_PL)
+.if defined(WITH_ISPELL_PL) || defined(ISPELL_PL)
 PLDISTFILE=	ispell-pl-20021127.tar.gz
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:pl/}
 MASTER_SITE_SUBDIR+=	ispell-pl/:pl
@@ -154,7 +160,7 @@
 EXTRACT_ONLY+=	${PLDISTFILE}
 BUILDHASH=	${WRKDIR}/${PLDISTFILE:S=.tar.gz==}/zbuduj.slownik.sh
 .endif
-.if defined(ISPELL_BG)
+.if defined(WITH_ISPELL_BG) || defined(ISPELL_BG)
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:bg/}
 MASTER_SITE_SUBDIR+=	bgoffice/:bg
 BGDISTFILE=	ispell-bg-2.1.tar.gz
@@ -162,38 +168,37 @@
 EXTRA_DICT+=	${BGDISTFILE}:bg
 EXTRACT_ONLY+=	${BGDISTFILE}
 .endif
-.if defined(ISPELL_SK)
+.if defined(WITH_ISPELL_SK) || defined(ISPELL_SK)
 SKDISTFILE=	ispell-sk-0.3.2.tar.gz
 MASTER_SITES+=	http://sk-spell.sk.cx/files/:sk
 EXTRA_DICT+=	${SKDISTFILE}:sk
 EXTRACT_ONLY+=	${SKDISTFILE}
 .endif
-.if defined(ISPELL_CS)
+.if defined(WITH_ISPELL_CS) || defined(ISPELL_CS)
 CSDISTFILE=	ispell-czech-20040229.tar.gz
 MASTER_SITES+=	ftp://ftp.vslib.cz/pub/unix/ispell/:cs
 EXTRA_DICT+=	${CSDISTFILE}:cs
 EXTRACT_ONLY+=	${CSDISTFILE}
 .endif
-.endif
 
 DISTFILES+=	${EXTRA_DICT}
 
 post-extract:
-.if defined(ISPELL_IT)
+.if defined(WITH_ISPELL_IT) || defined(ISPELL_IT)
 	@${TAR} -C ${WRKDIR} -zxf ${DISTDIR}/${ITDISTFILE}
 .endif
-.if defined(ISPELL_FR)
+.if defined(WITH_ISPELL_FR) || defined(ISPELL_FR)
 	@${MKDIR} ${WRKDIR}/francais-IREQ
 	@${TAR} -C ${WRKDIR}/francais-IREQ -zxf ${DISTDIR}/${FRDISTFILE}
 .endif
-.if defined(ISPELL_DEALT)
+.if defined(WITH_ISPELL_DEALT) || defined(ISPELL_DEALT)
 	@${MKDIR} ${WRKDIR}/hk-deutsch
 	@${TAR} -C ${WRKDIR}/hk-deutsch/ -zxf ${DISTDIR}/${DEALTDISTFILE}
 .endif
-.if defined(ISPELL_DENEU)
+.if defined(WITH_ISPELL_DENEU) || defined(ISPELL_DENEU)
 	@${TAR} -C ${WRKDIR}/ -yxf ${DISTDIR}/${DENEUDISTFILE}
 .endif
-.if defined(ISPELL_FI)
+.if defined(WITH_ISPELL_FI) || defined(ISPELL_FI)
 	${MKDIR} ${WRKDIR}/finnish
 .for file in ${FIDICTFILE} ${FIAFFIXFILE}
 	${BZIP2_CMD} -dc ${DISTDIR}/${file} \
@@ -202,37 +207,37 @@
 .endif
 
 post-patch:
-.if defined(ISPELL_IT)
+.if defined(WITH_ISPELL_IT) || defined(ISPELL_IT)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/IT.patch 2>/dev/null
 	@${REINPLACE_CMD} -e "s|%%BH%%|${BUILDHASH}|g;s|%%MH%%|${MUNCHLIST}|g" \
 		${WRKDIR}/ispell-it/Makefile
 .endif
-.if defined(ISPELL_FR)
+.if defined(WITH_ISPELL_FR) || defined(ISPELL_FR)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/FR.patch 2>/dev/null
 .endif
-.if defined(ISPELL_BR)
+.if defined(WITH_ISPELL_BR) || defined(ISPELL_BR)
 	@cd ${WRKDIR}/${BRDISTFILE:S/.tar.gz$//} && ${PATCH} < ${FILESDIR}/BR.patch 2>/dev/null
 .endif
-.if defined(ISPELL_DENEU)
+.if defined(WITH_ISPELL_DENEU) || defined(ISPELL_DENEU)
 	@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2$==} && ${PATCH} < ${FILESDIR}/DENEU.patch 2>/dev/null
 .endif
-.if defined(ISPELL_SE)
+.if defined(WITH_ISPELL_SE) || defined(ISPELL_SE)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/SE.patch 2>/dev/null
 .endif
-.if defined(ISPELL_NO)
+.if defined(WITH_ISPELL_NO) || defined(ISPELL_NO)
 	@cd ${WRKDIR}/norsk && ${PATCH} < ${FILESDIR}/NO.patch 2>/dev/null
 	@${MKDIR} ${WRKDIR}/bin && ${CP} ${FILESDIR}/unsq.pl ${WRKDIR}/bin && ${CHMOD} +x ${WRKDIR}/bin/unsq.pl
 .endif
-.if defined(ISPELL_NL)
+.if defined(WITH_ISPELL_NL) || defined(ISPELL_NL)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/NL.patch 2>/dev/null
 .endif
-.if defined(ISPELL_DA)
+.if defined(WITH_ISPELL_DA) || defined(ISPELL_DA)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/DA.patch 2>/dev/null
 .endif
-.if defined(ISPELL_AF)
+.if defined(WITH_ISPELL_AF) || defined(ISPELL_AF)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/AF.patch 2>/dev/null
 .endif
-.if defined(ISPELL_PL)
+.if defined(WITH_ISPELL_PL) || defined(ISPELL_PL)
 	@${REINPLACE_CMD} -e 's/bash/sh/'  -e 's:^buildhash:${WRKSRC}/buildhash:' ${BUILDHASH}
 .endif
 
@@ -244,16 +249,16 @@
 .endif
 
 post-build:
-.if defined(ISPELL_IT)
+.if defined(WITH_ISPELL_IT) || defined(ISPELL_IT)
 	@cd ${WRKDIR}/ispell-it && ${MAKE} all
 .endif
-.if defined(ISPELL_DENEU)
+.if defined(WITH_ISPELL_DENEU) || defined(ISPELL_DENEU)
 	@cd ${WRKDIR}/${DENEUDISTFILE:S=.tar.bz2==} && \
 		${MAKE} ${MAKEFLAGS} UNSQ=${UNSQ} BUILDHASH=${BUILDHASH} \
 			german.hash && \
 		${MV} german.hash ndeutsch.hash && ${MV} german.aff ndeutsch.aff
 .endif
-.if defined(ISPELL_DEALT)
+.if defined(WITH_ISPELL_DEALT) || defined(ISPELL_DEALT)
 	@cd ${WRKDIR}/${DEALTDISTFILE:S=.tar.gz==} && \
 		${CAT} worte.txt verben.txt \
 		adjektive.txt klein.txt geographie.txt vornamen.txt \
@@ -263,56 +268,56 @@
 		${SORT} -u > all.words && \
 		${BUILDHASH} all.words deutsch.aff deutsch.hash
 .endif
-.if defined(ISPELL_BR)
+.if defined(WITH_ISPELL_BR) || defined(ISPELL_BR)
 	@cd ${WRKDIR}/${BRDISTFILE:S=.tar.gz==} && \
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} all
 .endif
-.if defined(ISPELL_SE)
+.if defined(WITH_ISPELL_SE) || defined(ISPELL_SE)
 	@cd ${WRKDIR}/${SEDISTFILE:S=.tar.gz==} && \
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
 .endif
-.if defined(ISPELL_FR)
+.if defined(WITH_ISPELL_FR) || defined(ISPELL_FR)
 	@cd ${WRKDIR}/francais-IREQ && \
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
 .endif
-.if defined(ISPELL_NO)
+.if defined(WITH_ISPELL_NO) || defined(ISPELL_NO)
 	@cd ${WRKDIR}/norsk && \
 		${GMAKE} ${MAKEFLAGS} UNSQ=${UNSQ} BUILDHASH=${BUILDHASH} \
 			MUNCHLIST=${MUNCHLIST}
 .endif
-.if defined(ISPELL_NL)
+.if defined(WITH_ISPELL_NL) || defined(ISPELL_NL)
 	@cd ${WRKDIR}/${NLDISTFILE:S=.tar.gz==} && \
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} all
 .endif
-.if defined(ISPELL_DA)
+.if defined(WITH_ISPELL_DA) || defined(ISPELL_DA)
 	@cd ${WRKDIR}/${DADISTFILE:S=.tar.gz==} && \
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} ISPELL=${ISPELL} all
 .endif
-.if defined(ISPELL_AF)
+.if defined(WITH_ISPELL_AF) || defined(ISPELL_AF)
 	@cd ${WRKDIR}/${AFDISTFILE:S=.tar.gz==} && \
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH} all
 .endif
-.if defined(ISPELL_FI)
+.if defined(WITH_ISPELL_FI) || defined(ISPELL_FI)
 	@cd ${WRKDIR}/finnish && \
 		${BUILDHASH} ${FIDICTFILE:S/.bz2//} ${FIAFFIXFILE:S/.bz2//} \
 		finnish.hash && ${MV} ${FIAFFIXFILE:S/.bz2//} finnish.aff
 .endif
-.if defined(ISPELL_PL)
+.if defined(WITH_ISPELL_PL) || defined(ISPELL_PL)
 	@cd ${WRKDIR}/${PLDISTFILE:S=.tar.gz==} && \
 		${CAT} A B C imiona-A imiona-B fachowe/* > polish.dic && \
 		${BUILDHASH} polish.dic polish.aff polish.hash
 .endif
-.if defined(ISPELL_BG)
+.if defined(WITH_ISPELL_BG) || defined(ISPELL_BG)
 	@cd ${WRKDIR}/${BGDISTFILE:S=.tar.gz==} && \
 		${BUILDHASH} data/bulgarian.dict data/bulgarian.aff data/bulgarian.hash && \
 		${CP} data/bulgarian.aff bulgarian.aff && \
 		${CP} data/bulgarian.hash bulgarian.hash
 .endif
-.if defined(ISPELL_SK)
+.if defined(WITH_ISPELL_SK) || defined(ISPELL_SK)
 	@cd ${WRKDIR}/${SKDISTFILE:S=.tar.gz==} && \
 		${BUILDHASH} slovak.words slovak.aff slovak.hash
 .endif
-.if defined(ISPELL_CS)
+.if defined(WITH_ISPELL_CS) || defined(ISPELL_CS)
 	@cd ${WRKDIR}/ispell-czech && \
 		${MAKE} czech.a-z && \
 		${BUILDHASH} czech.a-z czech.aff czech.hash
@@ -324,7 +329,7 @@
 post-install:
 	@${RM} -f ${PREFIX}/bin/spell
 	@${LN} ${PREFIX}/bin/ispell ${PREFIX}/bin/spell
-.if defined(ISPELL_BRITISH)
+.if defined(WITH_ISPELL_BRITISH) || defined(ISPELL_BRITISH)
 	${INSTALL_DATA} ${WRKSRC}/languages/british/english.xlg \
 		${DATADIR}/english.dict
 .else
@@ -332,56 +337,56 @@
 		${DATADIR}/english.dict
 .endif
 	@-${INSTALL_DATA} ${WRKDIR}/*/*.aff ${WRKDIR}/*/*.hash ${DATADIR}
-.if defined(ISPELL_IT)
+.if defined(WITH_ISPELL_IT) || defined(ISPELL_IT)
 	@${CAT} ${MASTERDIR}/pkg-plist.it >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_FR)
+.if defined(WITH_ISPELL_FR) || defined(ISPELL_FR)
 	@${CAT} ${MASTERDIR}/pkg-plist.fr >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_DEALT)
+.if defined(WITH_ISPELL_DEALT) || defined(ISPELL_DEALT)
 	@${CAT} ${MASTERDIR}/pkg-plist.dealt >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_DENEU)
+.if defined(WITH_ISPELL_DENEU) || defined(ISPELL_DENEU)
 	@${CAT} ${MASTERDIR}/pkg-plist.deneu >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_BR)
+.if defined(WITH_ISPELL_BR) || defined(ISPELL_BR)
 	@${CAT} ${MASTERDIR}/pkg-plist.br >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_SE)
+.if defined(WITH_ISPELL_SE) || defined(ISPELL_SE)
 	@${CAT} ${MASTERDIR}/pkg-plist.se >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_NO)
+.if defined(WITH_ISPELL_NO) || defined(ISPELL_NO)
 	@${CAT} ${MASTERDIR}/pkg-plist.no >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_NL)
+.if defined(WITH_ISPELL_NL) || defined(ISPELL_NL)
 	@${CAT} ${MASTERDIR}/pkg-plist.nl >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_DA)
+.if defined(WITH_ISPELL_DA) || defined(ISPELL_DA)
 	@${CAT} ${MASTERDIR}/pkg-plist.da >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_AF)
+.if defined(WITH_ISPELL_AF) || defined(ISPELL_AF)
 	@${CAT} ${MASTERDIR}/pkg-plist.af >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_BRITISH)
+.if defined(WITH_ISPELL_BRITISH) || defined(ISPELL_BRITISH)
 	@${CAT} ${MASTERDIR}/pkg-plist.british >> ${TMPPLIST}
-.if defined(ISPELL_INCLAMERICAN)
+.if defined(WITH_ISPELL_AMERICAN) || defined(ISPELL_INCLAMERICAN)
 	@${CAT} ${MASTERDIR}/pkg-plist.am >> ${TMPPLIST}
 .endif
 .else
 	@${CAT} ${MASTERDIR}/pkg-plist.am >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_FI)
+.if defined(WITH_ISPELL_FI) || defined(ISPELL_FI)
 	@${CAT} ${MASTERDIR}/pkg-plist.fi >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_PL)
+.if defined(WITH_ISPELL_PL) || defined(ISPELL_PL)
 	@${CAT} ${MASTERDIR}/pkg-plist.pl >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_SK)
+.if defined(WITH_ISPELL_SK) || defined(ISPELL_SK)
 	@${CAT} ${MASTERDIR}/pkg-plist.sk >> ${TMPPLIST}
 .endif
-.if defined(ISPELL_CS)
+.if defined(WITH_ISPELL_CS) || defined(ISPELL_CS)
 	@${CAT} ${MASTERDIR}/pkg-plist.cs >> ${TMPPLIST}
 .endif
 	@${ECHO_CMD} "@dirrm share/ispell" >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list