diff options
| author | marcus <marcus@FreeBSD.org> | 2002-09-18 00:17:18 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2002-09-18 00:17:18 +0800 |
| commit | cca8ed3520f3267bf6429926c9d8c6d127c98dcc (patch) | |
| tree | 28cf6b62d7ba45c8d778853084d705f3652c4933 | |
| parent | 666beaa66edc5c17aacf84178e4153ffd834504b (diff) | |
| download | freebsd-ports-gnome-cca8ed3520f3267bf6429926c9d8c6d127c98dcc.tar.gz freebsd-ports-gnome-cca8ed3520f3267bf6429926c9d8c6d127c98dcc.tar.zst freebsd-ports-gnome-cca8ed3520f3267bf6429926c9d8c6d127c98dcc.zip | |
Remove an out-dated header pertaining to the non-existent mswordview port,
and add a conditional BROKEN if textproc/wv is installed. wv replaced
mswordview, and installs the same wv.h.
PR: 42812
| -rw-r--r-- | editors/AbiWord/Makefile | 8 | ||||
| -rw-r--r-- | editors/AbiWord2/Makefile | 8 | ||||
| -rw-r--r-- | editors/abiword-devel/Makefile | 8 | ||||
| -rw-r--r-- | editors/abiword/Makefile | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index 7452cec1b423..2e31b2dc9291 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -5,10 +5,6 @@ # $FreeBSD$ # -# Note: this port cannot be built when the textproc/mswordview port is -# already installed, due to header file conflicts and the very broken -# AbiWord build system. - PORTNAME= AbiWord PORTVERSION= 1.0.2 CATEGORIES= editors @@ -60,6 +56,10 @@ CONFIGURE_ARGS+=--enable-gnome PKGNAMESUFFIX= -gnome .endif +.if exists(${LOCALBASE}/include/wv.h) +BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build" +.endif + post-patch: @iconv -f cp1251 -t koi8-u ${WRKSRC}/user/wp/strings/uk-UA.strings > \ ${WRKDIR}/.uk-UA.strings diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 7452cec1b423..2e31b2dc9291 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -5,10 +5,6 @@ # $FreeBSD$ # -# Note: this port cannot be built when the textproc/mswordview port is -# already installed, due to header file conflicts and the very broken -# AbiWord build system. - PORTNAME= AbiWord PORTVERSION= 1.0.2 CATEGORIES= editors @@ -60,6 +56,10 @@ CONFIGURE_ARGS+=--enable-gnome PKGNAMESUFFIX= -gnome .endif +.if exists(${LOCALBASE}/include/wv.h) +BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build" +.endif + post-patch: @iconv -f cp1251 -t koi8-u ${WRKSRC}/user/wp/strings/uk-UA.strings > \ ${WRKDIR}/.uk-UA.strings diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index 7452cec1b423..2e31b2dc9291 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -5,10 +5,6 @@ # $FreeBSD$ # -# Note: this port cannot be built when the textproc/mswordview port is -# already installed, due to header file conflicts and the very broken -# AbiWord build system. - PORTNAME= AbiWord PORTVERSION= 1.0.2 CATEGORIES= editors @@ -60,6 +56,10 @@ CONFIGURE_ARGS+=--enable-gnome PKGNAMESUFFIX= -gnome .endif +.if exists(${LOCALBASE}/include/wv.h) +BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build" +.endif + post-patch: @iconv -f cp1251 -t koi8-u ${WRKSRC}/user/wp/strings/uk-UA.strings > \ ${WRKDIR}/.uk-UA.strings diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 7452cec1b423..2e31b2dc9291 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -5,10 +5,6 @@ # $FreeBSD$ # -# Note: this port cannot be built when the textproc/mswordview port is -# already installed, due to header file conflicts and the very broken -# AbiWord build system. - PORTNAME= AbiWord PORTVERSION= 1.0.2 CATEGORIES= editors @@ -60,6 +56,10 @@ CONFIGURE_ARGS+=--enable-gnome PKGNAMESUFFIX= -gnome .endif +.if exists(${LOCALBASE}/include/wv.h) +BROKEN= "This port cannot be built when textproc/wv is installed because of a header conflict. Please remove textproc/wv, and resume the build. If textproc/wv is no longer installed, please remove ${LOCALBASE}/include/wv.h, and resume the AbiWord build" +.endif + post-patch: @iconv -f cp1251 -t koi8-u ${WRKSRC}/user/wp/strings/uk-UA.strings > \ ${WRKDIR}/.uk-UA.strings |