diff options
| author | reed <reed@pkgsrc.org> | 2005-12-21 22:04:59 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2005-12-21 22:04:59 +0000 |
| commit | 3020cc418a2f02b16a7b6960b0b8cf8bc7b7facc (patch) | |
| tree | 0f4d7d00312bee1454d57e600d0627aec97805e3 /editors/abiword/Makefile | |
| parent | a50c0c2c0440e60b739d1a115ed9ffb61f33c075 (diff) | |
| download | pkgsrc-3020cc418a2f02b16a7b6960b0b8cf8bc7b7facc.tar.gz | |
Fix installation of help files.
This is during the freeze. Hopefully, this fixes PR #32310
and #32144. Before this fix, under Linux, the package's PLIST
didn't match up with what was actually installed. Also problem
was seen recently on bulk-builds list.
Add patch-af from
abiword-2.0.9-windowshelppaths.patch from Fedora Core 4 Extras abiword-2.4.1-2.
This gets rid of the DOS style file paths of images.
Add patch-ag to have portable use of cp -r * instead of */.
This fixes problem where files were not installed to their subdirectories.
Use post-build target to create "help" docs and to clean out junk.
(Fixes problem where "make clean" can't clean.)
Fix permissions in post-build too. Fixes problem where some
subdirectories for the help files were not browsable.
Copy the help files into place in the post-install target.
Many PLIST changes due to fixing of the help files.
While I am here, use PKGMANDIR instead of "man" and add INSTALLATION_DIRS
for that.
Bump PKGREVISION.
The maintainer of this package, adam, said he was unavailable to
work on this currently and said it was okay for me to work on this.
I tested on PkgLinux and NetBSD/i386. I reviewed some "help" files
in browser (which abiword opens). And saw some images too.
Diffstat (limited to 'editors/abiword/Makefile')
| -rw-r--r-- | editors/abiword/Makefile | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 9754f1119d7..efe618a044b 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.92 2005/10/04 09:55:05 adam Exp $ +# $NetBSD: Makefile,v 1.93 2005/12/21 22:04:59 reed Exp $ .include "Makefile.common" PKGNAME= abiword-${ABIWORD_VERSION} +PKGREVISION= 1 COMMENT= Open Source cross-platform word processor # GTK1 version and previous name of the GTK2 version @@ -31,14 +32,25 @@ CONFIGURE_ARGS+= --disable-Cocoa CONFIGURE_ARGS+= --enable-threads --with-libxml2 CONFIGURE_ARGS+= --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} + USE_GNU_ICONV= yes +INSTALLATION_DIRS= ${PKGMANDIR}/man1 + +post-build: + cd ${WRKDIR}/${DISTNAME}/abiword-docs/ && env \ + ABI_DOC_DEST=${WRKDIR} \ + ABI_DOC_PROG=${WRKSRC}/src/wp/main/unix/AbiWord-2.4 \ + ./make-html.sh + ${FIND} ${WRKDIR}/help -type d -exec ${CHMOD} ${PKGDIRMODE} "{}" \; + ${FIND} ${WRKDIR}/help \( -name "*.abw.orig" -or -name "*.abw" \ + -or -name "*.info" -or -name "*.xhtml" \) -exec ${RM} "{}" \; + post-install: ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.1 \ - ${PREFIX}/man/man1/abiword.1 - cd ${WRKDIR}/${DISTNAME}/abiword-docs/ && env \ - ABI_DOC_DEST=${PREFIX}/share/AbiSuite-2.4/AbiWord \ - ABI_DOC_PROG=AbiWord-2.4 ./make-html.sh + ${PREFIX}/${PKGMANDIR}/man1/abiword.1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/AbiSuite-2.4/AbiWord + ${CP} -R ${WRKDIR}/help ${PREFIX}/share/AbiSuite-2.4/AbiWord/ .include "../../converters/libiconv/buildlink3.mk" .include "../../converters/wv/buildlink3.mk" |