1: Stagify.

2: USES=libtool, bump version.
3: strip binary.

Approved by:	portmgr@ (blanket)

2 files changed, 109 insertions, 58 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 74450331f5c9..bb0b5155dfb6 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	jpilot
 PORTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	palm comms
 MASTER_SITES=	http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/ \
 		http://jpilot.org/
@@ -13,25 +13,20 @@ MASTER_SITES=	http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distf
 MAINTAINER?=	samm@os2.kiev.ua
 COMMENT=	Desktop Organizer Software for the Palm Pilot
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libpisock.so:${PORTSDIR}/palm/pilot-link
 
 USE_GCC=	any
-USES=		pkgconfig gmake
+USES=		pkgconfig gmake libtool
 USE_GNOME=	gnomehier
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
-
-LICENSE=	GPLv2
-
 USE_GNOME+=	gtk20
-
-MAN1=		jpilot-dial.1 jpilot-dump.1 jpilot-sync.1 jpilot.1
-
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS NLS
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.options.mk>
 
@@ -44,38 +39,24 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=		NLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
-
 post-build:
 	cd ${WRKSRC}/docs && ${MAKE_CMD}
+
 post-install:
-	@${FIND} ${PREFIX}/lib/jpilot ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/lib/jpilot -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dial.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dump.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-sync.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/docs/jpilot.1 ${PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${DATADIR}/icons
-	${INSTALL_DATA} ${WRKSRC}/empty/*.pdb ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/jpilotrc.* ${DATADIR}
-	@${FIND} ${DATADIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dial.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-dump.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/jpilot-sync.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/jpilot.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${STAGEDIR}${DATADIR}/icons
+	${INSTALL_DATA} ${WRKSRC}/empty/*.pdb ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/jpilotrc.* ${STAGEDIR}${DATADIR}
 .for ext in html png jpg
-	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
-.endif
+	${INSTALL_DATA} ${WRKSRC}/icons/README ${STAGEDIR}${DOCSDIR}/README.icons
 
 .include <bsd.port.mk>
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index 6d8435c27182..deb8371389d6 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -2,26 +2,96 @@ bin/jpilot
 bin/jpilot-dump
 bin/jpilot-merge
 bin/jpilot-sync
+lib/jpilot/plugins/libexpense.so
+lib/jpilot/plugins/libkeyring.so
+lib/jpilot/plugins/libsynctime.so
+man/man1/jpilot-dial.1.gz
+man/man1/jpilot-dump.1.gz
+man/man1/jpilot-sync.1.gz
+man/man1/jpilot.1.gz
 share/applications/jpilot.desktop
-%%NLS%%share/locale/ca/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/da/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/de/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/es/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/it/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/jpilot.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/jpilot.mo
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.icons
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/icons/README
+%%PORTDOCS%%%%DOCSDIR%%/icons/jpilot-icon1.xpm
+%%PORTDOCS%%%%DOCSDIR%%/icons/jpilot-icon2.xpm
+%%PORTDOCS%%%%DOCSDIR%%/icons/jpilot-icon3.xpm
+%%PORTDOCS%%%%DOCSDIR%%/icons/jpilot-icon4.xpm
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-address.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-datebook.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-expense.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-install.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-memo.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-1.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-2.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-3.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-4.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-5.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-6.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-7.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-prefs-8.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-print.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-search.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-todo.png
+%%PORTDOCS%%%%DOCSDIR%%/jpilot-toplogo.jpg
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/plugin.html
+%%DATADIR%%/AddressDB.pdb
+%%DATADIR%%/CalendarDB-PDat.pdb
+%%DATADIR%%/ContactsDB-PAdd.pdb
+%%DATADIR%%/DatebookDB.pdb
+%%DATADIR%%/ExpenseDB.pdb
+%%DATADIR%%/MañanaDB.pdb
+%%DATADIR%%/Memo32DB.pdb
+%%DATADIR%%/MemoDB.pdb
+%%DATADIR%%/MemosDB-PMem.pdb
+%%DATADIR%%/TasksDB-PTod.pdb
+%%DATADIR%%/ToDoDB.pdb
+%%DATADIR%%/icons/address.xpm
+%%DATADIR%%/icons/backup.xpm
+%%DATADIR%%/icons/cancel_sync.xpm
+%%DATADIR%%/icons/datebook.xpm
+%%DATADIR%%/icons/jpilot-icon1.xpm
+%%DATADIR%%/icons/jpilot-icon2.xpm
+%%DATADIR%%/icons/jpilot-icon3.xpm
+%%DATADIR%%/icons/jpilot-icon4.xpm
+%%DATADIR%%/icons/memo.xpm
+%%DATADIR%%/icons/sync.xpm
+%%DATADIR%%/icons/todo.xpm
+%%DATADIR%%/jpilotrc.blue
+%%DATADIR%%/jpilotrc.default
+%%DATADIR%%/jpilotrc.green
+%%DATADIR%%/jpilotrc.purple
+%%DATADIR%%/jpilotrc.steel
+share/locale/ca/LC_MESSAGES/jpilot.mo
+share/locale/cs/LC_MESSAGES/jpilot.mo
+share/locale/da/LC_MESSAGES/jpilot.mo
+share/locale/de/LC_MESSAGES/jpilot.mo
+share/locale/es/LC_MESSAGES/jpilot.mo
+share/locale/fr/LC_MESSAGES/jpilot.mo
+share/locale/it/LC_MESSAGES/jpilot.mo
+share/locale/ja/LC_MESSAGES/jpilot.mo
+share/locale/ko/LC_MESSAGES/jpilot.mo
+share/locale/nb/LC_MESSAGES/jpilot.mo
+share/locale/nl/LC_MESSAGES/jpilot.mo
+share/locale/pt_BR/LC_MESSAGES/jpilot.mo
+share/locale/ru/LC_MESSAGES/jpilot.mo
+share/locale/rw/LC_MESSAGES/jpilot.mo
+share/locale/sv/LC_MESSAGES/jpilot.mo
+share/locale/tr/LC_MESSAGES/jpilot.mo
+share/locale/uk/LC_MESSAGES/jpilot.mo
+share/locale/vi/LC_MESSAGES/jpilot.mo
+share/locale/zh_CN/LC_MESSAGES/jpilot.mo
+share/locale/zh_TW/LC_MESSAGES/jpilot.mo
+@dirrmtry lib/jpilot/plugins
+@dirrmtry lib/jpilot
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%DATADIR%%/icons
+@dirrmtry %%DATADIR%%