2 files changed, 42 insertions, 142 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 6002e0c9a00b..686e82fd604c 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -17,18 +17,18 @@ COMMENT=	Desktop Organizer Software for the Palm Pilot
 
 LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
-CONFIGURE_ARGS+=	--with-pilot-prefix=${PREFIX}
-.if (!defined(WITHOUT_NLS))
-USE_GETTEXT=	yes
-.endif
-.if defined(WITH_GTK1)
-USE_GNOME=	gtk12
-.else
-USE_GNOME=	gtk20
-CONFIGURE_ARGS+=	--enable-gtk2=yes
-.endif
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomehier
+USE_LIBTOOL_VER=13
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 
 .if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB=		NLS=""
 .else
@@ -36,57 +36,43 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=		NLS="@comment "
 .endif
 
-USE_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
-CFLAGS+=	-I${PREFIX}/include
-CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
+.if defined(WITH_GTK1)
+USE_GNOME+=	gtk12
+.else
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=	--enable-gtk2=yes
+.endif
 
 MAN1=		jpilot-sync.1 jpilot.1
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 post-install:
-	${MKDIR} ${PREFIX}/man/man1
-	${CP} ${WRKSRC}/docs/jpilot-sync.1 ${PREFIX}/man/man1
-	${CP} ${WRKSRC}/docs/jpilot.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/jpilot/icons
-	${CP} ${WRKSRC}/icons/jpilot-icon1.xpm ${PREFIX}/share/jpilot/icons
-	${CP} ${WRKSRC}/icons/jpilot-icon2.xpm ${PREFIX}/share/jpilot/icons
-	${CP} ${WRKSRC}/icons/jpilot-icon3.xpm ${PREFIX}/share/jpilot/icons
-	${CP} ${WRKSRC}/icons/jpilot-icon4.xpm ${PREFIX}/share/jpilot/icons
-	${CP} ${WRKSRC}/empty/AddressDB.pdb ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/empty/DatebookDB.pdb ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/empty/ExpenseDB.pdb ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/empty/Memo32DB.pdb ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/empty/MemoDB.pdb ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/empty/ToDoDB.pdb ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/jpilotrc.blue ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/jpilotrc.default ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/jpilotrc.green ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/jpilotrc.purple ${PREFIX}/share/jpilot
-	${CP} ${WRKSRC}/jpilotrc.steel ${PREFIX}/share/jpilot
+	@${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-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 !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/manual.html ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/plugin.html ${DOCSDIR}
-	${CP} ${WRKSRC}/AUTHORS ${DOCSDIR}
-	${CP} ${WRKSRC}/BUGS ${DOCSDIR}
-	${CP} ${WRKSRC}/COPYING ${DOCSDIR}
-	${CP} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${CP} ${WRKSRC}/INSTALL ${DOCSDIR}
-	${CP} ${WRKSRC}/README ${DOCSDIR}
-	${CP} ${WRKSRC}/TODO ${DOCSDIR}
-	${CP} ${WRKSRC}/UPGRADING ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-address.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-datebook.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-expense.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-install.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-memo.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-prefs.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-print.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-search.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-todo.png ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/jpilot-toplogo.jpg ${DOCSDIR}
-	${CP} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
+	@${MKDIR} ${DOCSDIR}
+.for ext in html png jpg
+	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
+.endfor
+.for i in AUTHORS BUGS COPYING ChangeLog INSTALL README TODO UPGRADING
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/icons/README ${DOCSDIR}/README.icons
 .endif
 
 .include <bsd.port.mk>
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index fdfdc888ee61..1c19a56ece05 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -1,52 +1,7 @@
 bin/jpilot
 bin/jpilot-dump
 bin/jpilot-sync
-lib/jpilot/plugins/libexpense.la
-lib/jpilot/plugins/libexpense.so
-lib/jpilot/plugins/libexpense.so.0
-lib/jpilot/plugins/libkeyring.la
-lib/jpilot/plugins/libkeyring.so
-lib/jpilot/plugins/libkeyring.so.0
-lib/jpilot/plugins/libsynctime.la
-lib/jpilot/plugins/libsynctime.so
-lib/jpilot/plugins/libsynctime.so.0
-%%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%%/UPGRADING
-%%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.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
 share/gnome/apps/Applications/jpilot.desktop
-share/jpilot/AddressDB.pdb
-share/jpilot/DatebookDB.pdb
-share/jpilot/ExpenseDB.pdb
-share/jpilot/Memo32DB.pdb
-share/jpilot/MemoDB.pdb
-share/jpilot/ToDoDB.pdb
-share/jpilot/jpilotrc.blue
-share/jpilot/jpilotrc.default
-share/jpilot/jpilotrc.green
-share/jpilot/jpilotrc.purple
-share/jpilot/jpilotrc.steel
-share/jpilot/icons/jpilot-icon1.xpm
-share/jpilot/icons/jpilot-icon2.xpm
-share/jpilot/icons/jpilot-icon3.xpm
-share/jpilot/icons/jpilot-icon4.xpm
 %%NLS%%share/locale/ca/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/jpilot.mo
 %%NLS%%share/locale/da/LC_MESSAGES/jpilot.mo
@@ -63,44 +18,3 @@ share/jpilot/icons/jpilot-icon4.xpm
 %%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
-@dirrm share/jpilot/icons
-@dirrm share/jpilot
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/jpilot/plugins
-@dirrm lib/jpilot
-%%NLS%%@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/da 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/it 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/vi/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/vi 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true