diff options
author | adam <adam@pkgsrc.org> | 2006-11-09 15:25:32 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2006-11-09 15:25:32 +0000 |
commit | b5216d3f821769d7917a7234bc5dc85e4a16ae29 (patch) | |
tree | 09a06be5eb4d10c6d54b6f8e490e29dc4f21e91c /editors/abiword | |
parent | 294f26dc98072d03036212346330e05b7d919f36 (diff) | |
download | pkgsrc-b5216d3f821769d7917a7234bc5dc85e4a16ae29.tar.gz |
Changes 2.4.6:
* Bug-fix release, see ChangeLog for details
Diffstat (limited to 'editors/abiword')
-rw-r--r-- | editors/abiword/Makefile | 14 | ||||
-rw-r--r-- | editors/abiword/Makefile.common | 4 | ||||
-rw-r--r-- | editors/abiword/distinfo | 9 | ||||
-rw-r--r-- | editors/abiword/patches/patch-ae | 15 |
4 files changed, 12 insertions, 30 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 436f39577e9..4032139e2d7 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2006/10/05 10:49:23 adam Exp $ +# $NetBSD: Makefile,v 1.105 2006/11/09 15:25:32 adam Exp $ .include "Makefile.common" -PKGREVISION= 2 - COMMENT= Open Source cross-platform word processor # GTK1 version and previous name of the GTK2 version @@ -37,22 +35,22 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} USE_GNU_ICONV= yes -INSTALLATION_DIRS= ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 +INSTALLATION_DIRS+= share/AbiSuite-2.4/AbiWord 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" \ + 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}/${PKGMANDIR}/man1/abiword.1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/AbiSuite-2.4/AbiWord - ${CP} -R ${WRKDIR}/help ${PREFIX}/share/AbiSuite-2.4/AbiWord/ + cp -R ${WRKDIR}/help ${PREFIX}/share/AbiSuite-2.4/AbiWord/ .if !empty(PKG_OPTIONS:Mgucharmap) .include "../../fonts/gucharmap/buildlink3.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 2b85da97b6d..7a4f6948a4d 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.35 2006/09/09 02:41:58 obache Exp $ +# $NetBSD: Makefile.common,v 1.36 2006/11/09 15:25:32 adam Exp $ # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating -ABIWORD_VERSION= 2.4.5 +ABIWORD_VERSION= 2.4.6 DISTNAME= abiword-${ABIWORD_VERSION} CATEGORIES= editors diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 5d6f7a03332..0fa4d676f3a 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.54 2006/10/05 10:49:23 adam Exp $ +$NetBSD: distinfo,v 1.55 2006/11/09 15:25:32 adam Exp $ -SHA1 (abiword-2.4.5.tar.bz2) = bca02a8beb490246f785518fc82c6c557a77a88d -RMD160 (abiword-2.4.5.tar.bz2) = f0de27f97135f8fff9b4400b05d74a27eee348cd -Size (abiword-2.4.5.tar.bz2) = 24930028 bytes +SHA1 (abiword-2.4.6.tar.bz2) = 3011d221d09336f09f4bb0732add3405961a8623 +RMD160 (abiword-2.4.6.tar.bz2) = ca56800d811b3aca0af6b2fb6cd70cbea29ab792 +Size (abiword-2.4.6.tar.bz2) = 24994889 bytes SHA1 (patch-aa) = b305b8a5dcf16c76e4bc858b6b484592b68aaca1 SHA1 (patch-ab) = 94191b278b6c5d0a37231efde9dc11097d6c1590 SHA1 (patch-ac) = 8fe244939c96a322a4db61463b8f66af0fc61e35 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5 -SHA1 (patch-ae) = a9d395f4128765737095655e94e586eb3a9c7b1f SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d SHA1 (patch-ag) = a4d4569e2bb67110aa160f2f596c32bbd5bac9c4 diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae deleted file mode 100644 index e2a2d4fe00b..00000000000 --- a/editors/abiword/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.19 2006/10/05 10:49:24 adam Exp $ - ---- src/af/xap/unix/xap_UnixApp.cpp.orig 2006-10-05 11:18:55.000000000 +0900 -+++ src/af/xap/unix/xap_UnixApp.cpp 2006-10-05 11:19:58.000000000 +0900 -@@ -134,10 +134,6 @@ - DELETEP(m_pUnixToolbarIcons); - - delete m_fontManager; -- --#if FC_MINOR > 2 -- FcFini(); --#endif - } - - bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue) |