. Define USE_JAVA.

. Remove definition of JAVAJARDIR, its defined in bsd.java.mk.
. Use PORTDOCS to simplify the packing list.
. Respect NOPORTDOCS for examples.
. Use %%JAVAJARDIR%% in the packling now that bsd.java.mk sets it.

2 files changed, 24 insertions, 189 deletions

diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
index bae2c1643b47..2a237a46639b 100644
--- a/textproc/resume/Makefile
+++ b/textproc/resume/Makefile
@@ -16,11 +16,15 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML Resume library
 
+USE_JAVA=	yes
 USE_REINPLACE=	yes
 NO_BUILD=	yes
-JAVAJARDIR=	${PREFIX}/share/java/classes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|\.\./\.\./css|css|' ${WRKSRC}/xsl/params.xsl
 	${FIND} ${WRKSRC} -name '*.bak' -delete
@@ -34,9 +38,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/java/*.jar ${JAVAJARDIR}
 
 post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
diff --git a/textproc/resume/pkg-plist b/textproc/resume/pkg-plist
index c6e398996463..78b8101ab8aa 100644
--- a/textproc/resume/pkg-plist
+++ b/textproc/resume/pkg-plist
@@ -68,190 +68,21 @@ share/xsl/resume/params.xsl
 @dirrm share/xsl/resume/country
 @dirrm share/xsl/resume
 @unexec rmdir %D/share/xsl 2>/dev/null || true
-share/java/classes/xmlresume-filter.jar
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/addressing/Makefile
-%%EXAMPLESDIR%%/addressing/README
-%%EXAMPLESDIR%%/addressing/brazil.xml
-%%EXAMPLESDIR%%/addressing/canada.xml
-%%EXAMPLESDIR%%/addressing/ireland.xml
-%%EXAMPLESDIR%%/addressing/italy.xml
-%%EXAMPLESDIR%%/addressing/norway.xml
-%%EXAMPLESDIR%%/addressing/nz.xml
-%%EXAMPLESDIR%%/addressing/uk.xml
-%%EXAMPLESDIR%%/addressing/untagged.xml
-%%EXAMPLESDIR%%/addressing/usa.xml
-%%EXAMPLESDIR%%/build.xml
-%%EXAMPLESDIR%%/example1.xml
-%%EXAMPLESDIR%%/example2.xml
-@dirrm %%EXAMPLESDIR%%/addressing
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/authors/index.html
-%%PORTDOCS%%%%DOCSDIR%%/changelog/index.html
-%%PORTDOCS%%%%DOCSDIR%%/copying/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/appendixes.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/box-0.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/box-1.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/caret-l.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/caret-r.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/caret-t.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/caret-u.gif
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/cssref.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.academics.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.achievement.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.achievements.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.address.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.annotation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.artTitle.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.author.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.award.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.awards.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.birth.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.bookTitle.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.break.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.citation.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.city.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.clearance.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.clearances.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.company.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.contact.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.country.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.county.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.date.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.dayOfMonth.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.degree.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.degrees.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.description.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.docpath.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.email.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.emphasis.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.employer.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.fax.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.firstname.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.from.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.gpa.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.head.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.header.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.history.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.instantMessage.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.institution.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.interest.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.interests.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.job.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.jobtitle.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.keyword.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.keywords.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.label.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.lastModified.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.legalnotice.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.level.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.link.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.location.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.major.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.membership.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.memberships.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.middlenames.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.minor.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.misc.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.month.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.name.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.node.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.note.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.objective.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.organization.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.pageNums.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.pager.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.para.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.period.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.phone.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.possible.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.postalCode.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.prefecture.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.present.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.project.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.projects.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.province.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.pub.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.pubDate.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.publisher.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.pubs.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.referee.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.referees.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.result.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.resume.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.resumes.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.score.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.skill.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.skillarea.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.skillareas.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.skills.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.skillset.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.state.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.street.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.street2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.subject.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.subjects.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.suburb.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.suffix.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.surname.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.tail.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.title.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.to.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.uri.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.url.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.ward.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.year.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/element.zip.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/elementref.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.explore.about.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.explore.create.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.explore.features.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.explore.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.explore.next-steps.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.setup.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.setup.install.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/getting-started.setup.software.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gfdl.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/gloss.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/manual.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.address.format.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.css.href.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.header.format.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.interest.description.format.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.referees.display.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.skills.format.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.skills.level.display.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/param.subjects.format.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/paramref.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/html/ref.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/news/index.html
-%%PORTDOCS%%%%DOCSDIR%%/todo/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/todo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/news
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/copying
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/changelog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/authors
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%JAVAJARDIR%%/xmlresume-filter.jar
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/brazil.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/canada.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/ireland.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/italy.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/norway.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/nz.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/uk.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/untagged.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/usa.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/build.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/example1.xml
+%%PORTDOCS%%%%EXAMPLESDIR%%/example2.xml
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/addressing
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%