Commit the remaining files for the jpilot 0.99.7 upgrade.

Minor changes and bugfixes only.
Closes PR pkg/24635 by Brian de Alwis.

3 files changed, 17 insertions, 20 deletions

diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index fa96927ae71..becf2d334a9 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2005/09/05 07:51:58 rh Exp $
 #
 
-DISTNAME=		jpilot-0.99.5
-PKGREVISION=		6
+DISTNAME=		jpilot-0.99.7
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
 
-MAINTAINER=		rh@NetBSD.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://jpilot.org/
 COMMENT=		Desktop organizer application for the palm pilot
 
@@ -14,11 +13,12 @@ BUILD_USES_MSGFMT=	YES
 
 CONFLICTS+=		jpilot-libplugin-[0-9]*
 
-USE_DIRS+=		gnome1-1.0
 USE_LIBTOOL=		YES
-USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
 USE_OLD_DES_API=	YES
+USE_DIRS+=		gnome1-1.0
+USE_TOOLS+=		pkg-config
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
@@ -28,7 +28,6 @@ LDFLAGS+=		-export-dynamic
 
 DOCDIR=			${PREFIX}/share/doc/jpilot
 INCDIR=			${PREFIX}/include/jpilot
-HTMLDIR=		${PREFIX}/share/doc/html/jpilot
 MAN1DIR=		${PREFIX}/man/man1
 PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
 
@@ -50,11 +49,9 @@ pre-configure:
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${INCDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
 	${INSTALL_DATA_DIR} ${PLUGINSDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} libplugin.h prefs.h ${INCDIR}
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DOCDIR}
-	cd ${WRKSRC}/docs; ${INSTALL_DATA} *.html ${HTMLDIR}
 	cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR}
 	${TOUCH} ${PLUGINSDIR}/.directory
 
diff --git a/comms/jpilot/PLIST b/comms/jpilot/PLIST
index 0316b631747..f058bf98569 100644
--- a/comms/jpilot/PLIST
+++ b/comms/jpilot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:20 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/09/05 07:51:58 rh Exp $
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
@@ -8,12 +8,11 @@ lib/jpilot/plugins/.directory
 lib/jpilot/plugins/libexpense.la
 lib/jpilot/plugins/libkeyring.la
 lib/jpilot/plugins/libsynctime.la
+man/man1/jpilot-dial.1
 man/man1/jpilot-dump.1
 man/man1/jpilot-sync.1
 man/man1/jpilot-upgrade-99.1
 man/man1/jpilot.1
-share/doc/html/jpilot/manual.html
-share/doc/html/jpilot/plugin.html
 share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/BUGS
 share/doc/${PKGNAME}/COPYING
@@ -65,13 +64,14 @@ ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/jpilot.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/jpilot.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot
-@dirrm share/doc/jpilot
+@dirrm share/gnome/apps/Applications
 @dirrm share/doc/${PKGNAME}/icons
 @dirrm share/doc/${PKGNAME}
-@dirrm share/doc/html/jpilot
+@dirrm share/doc/jpilot
 @dirrm lib/jpilot/plugins
 @dirrm lib/jpilot
 @dirrm include/jpilot
diff --git a/comms/jpilot/distinfo b/comms/jpilot/distinfo
index 7d5f7fb70b8..0021838b598 100644
--- a/comms/jpilot/distinfo
+++ b/comms/jpilot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2005/02/23 16:05:30 agc Exp $
+$NetBSD: distinfo,v 1.16 2005/09/05 07:51:58 rh Exp $
 
-SHA1 (jpilot-0.99.5.tar.gz) = 357807f50edb301db81ab9f7aaedcb5541e86eec
-RMD160 (jpilot-0.99.5.tar.gz) = d6d00d8a8663dea7a55d60fb2909a20b0566e423
-Size (jpilot-0.99.5.tar.gz) = 1033716 bytes
-SHA1 (patch-aa) = f24450c6851f295163fa5440a6d60009466d33fc
-SHA1 (patch-ad) = e1e7ce9e7cc1bd1e901f6763799cdfd03f3cd605
+SHA1 (jpilot-0.99.7.tar.gz) = 4ecdc3c00fa4b7d475d156f1cef6840c5e8aa4dc
+RMD160 (jpilot-0.99.7.tar.gz) = 04516b0be321addaf636205372483178dff5c839
+Size (jpilot-0.99.7.tar.gz) = 1197119 bytes
+SHA1 (patch-ab) = 00252b62491d894572a59645dcdfdf8edd3d0b21
+SHA1 (patch-ad) = cac013141685ff632cafc7a45841d4c9b77a957f