Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Nov 2014 11:30:42 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r372556 - in head/java: avis bluej bootstrap-openjdk bouncycastle cacao classpath commonclipse cos cryptix-jce dbvis eclipse eclipse-EPIC eclipse-RDT eclipse-checkstyle eclipse-drjava e...
Message-ID:  <201411141130.sAEBUgtH085214@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Fri Nov 14 11:30:42 2014
New Revision: 372556
URL: https://svnweb.freebsd.org/changeset/ports/372556
QAT: https://qat.redports.org/buildarchive/r372556/

Log:
  Cleanup plist

Deleted:
  head/java/eclipse-langpack/pkg-plist
Modified:
  head/java/avis/pkg-plist
  head/java/bluej/pkg-plist
  head/java/bootstrap-openjdk/pkg-plist
  head/java/bouncycastle/pkg-plist
  head/java/cacao/pkg-plist
  head/java/classpath/pkg-plist
  head/java/commonclipse/pkg-plist
  head/java/cos/pkg-plist
  head/java/cryptix-jce/pkg-plist
  head/java/dbvis/Makefile
  head/java/eclipse-EPIC/Makefile
  head/java/eclipse-RDT/Makefile
  head/java/eclipse-checkstyle/pkg-plist
  head/java/eclipse-drjava/pkg-plist
  head/java/eclipse-examples/pkg-plist
  head/java/eclipse-gef-examples/pkg-plist
  head/java/eclipse-hibernatetools/Makefile
  head/java/eclipse-hibernatetools/pkg-plist
  head/java/eclipse-log4e/Makefile
  head/java/eclipse-lomboz/Makefile
  head/java/eclipse-ocl/Makefile
  head/java/eclipse-pmd/pkg-plist
  head/java/eclipse-propedit/Makefile
  head/java/eclipse-quantum/pkg-plist
  head/java/eclipse-shelled/Makefile
  head/java/eclipse-sqlexplorer/Makefile
  head/java/eclipse-sysdeo-tomcat/Makefile
  head/java/eclipse-uml/Makefile
  head/java/eclipse-vep-examples/pkg-plist
  head/java/eclipse-vep/Makefile
  head/java/eclipse-viplugin/pkg-plist
  head/java/eclipse/Makefile
  head/java/eclipse/Makefile.plugins

Modified: head/java/avis/pkg-plist
==============================================================================
--- head/java/avis/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/avis/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -1,4 +1,3 @@
 sbin/avisd
 etc/avisd.conf.sample
 libexec/avis/avis-router.jar
-@dirrm libexec/avis

Modified: head/java/bluej/pkg-plist
==============================================================================
--- head/java/bluej/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/bluej/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -437,72 +437,3 @@ bluej/lib/swedish/templates/readme.tmpl
 bluej/lib/trilead.jar
 bluej/lib/userlib/README.TXT
 bluej/lib/windowtofront.js
-@dirrmtry bluej/lib/userlib
-@dirrmtry bluej/lib/swedish/templates/newclass
-@dirrmtry bluej/lib/swedish/templates
-@dirrmtry bluej/lib/swedish
-@dirrmtry bluej/lib/spanish/templates/newclass
-@dirrmtry bluej/lib/spanish/templates
-@dirrmtry bluej/lib/spanish
-@dirrmtry bluej/lib/slovak/templates/newclass
-@dirrmtry bluej/lib/slovak/templates
-@dirrmtry bluej/lib/slovak
-@dirrmtry bluej/lib/russian/templates/newclass
-@dirrmtry bluej/lib/russian/templates
-@dirrmtry bluej/lib/russian
-@dirrmtry bluej/lib/portuguese/templates/newclass
-@dirrmtry bluej/lib/portuguese/templates
-@dirrmtry bluej/lib/portuguese
-@dirrmtry bluej/lib/korean/templates/newclass
-@dirrmtry bluej/lib/korean/templates
-@dirrmtry bluej/lib/korean
-@dirrmtry bluej/lib/japanese/templates/newclass
-@dirrmtry bluej/lib/japanese/templates
-@dirrmtry bluej/lib/japanese
-@dirrmtry bluej/lib/italian/templates/newclass
-@dirrmtry bluej/lib/italian/templates
-@dirrmtry bluej/lib/italian
-@dirrmtry bluej/lib/images
-@dirrmtry bluej/lib/greek/templates/newclass
-@dirrmtry bluej/lib/greek/templates
-@dirrmtry bluej/lib/greek
-@dirrmtry bluej/lib/german/templates/newclass
-@dirrmtry bluej/lib/german/templates
-@dirrmtry bluej/lib/german
-@dirrmtry bluej/lib/french/templates/newclass
-@dirrmtry bluej/lib/french/templates
-@dirrmtry bluej/lib/french
-@dirrmtry bluej/lib/extensions
-@dirrmtry bluej/lib/english/templates/newclass
-@dirrmtry bluej/lib/english/templates
-@dirrmtry bluej/lib/english
-@dirrmtry bluej/lib/dutch/templates/newclass
-@dirrmtry bluej/lib/dutch/templates
-@dirrmtry bluej/lib/dutch
-@dirrmtry bluej/lib/danish/templates/newclass
-@dirrmtry bluej/lib/danish/templates
-@dirrmtry bluej/lib/danish
-@dirrmtry bluej/lib/czech/templates/newclass
-@dirrmtry bluej/lib/czech/templates
-@dirrmtry bluej/lib/czech
-@dirrmtry bluej/lib/chinese/templates/newclass
-@dirrmtry bluej/lib/chinese/templates
-@dirrmtry bluej/lib/chinese
-@dirrmtry bluej/lib/catalan/templates/newclass
-@dirrmtry bluej/lib/catalan/templates
-@dirrmtry bluej/lib/catalan
-@dirrmtry bluej/lib/afrikaans/templates/newclass
-@dirrmtry bluej/lib/afrikaans/templates
-@dirrmtry bluej/lib/afrikaans
-@dirrmtry bluej/lib
-@dirrmtry bluej/icons
-@dirrmtry bluej/examples/shapes
-@dirrmtry bluej/examples/picture
-@dirrmtry bluej/examples/people2
-@dirrmtry bluej/examples/people
-@dirrmtry bluej/examples/hello
-@dirrmtry bluej/examples/file-reader
-@dirrmtry bluej/examples/debugdemo
-@dirrmtry bluej/examples/appletdemo
-@dirrmtry bluej/examples
-@dirrmtry bluej

Modified: head/java/bootstrap-openjdk/pkg-plist
==============================================================================
--- head/java/bootstrap-openjdk/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/bootstrap-openjdk/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -53,19 +53,3 @@
 %%JDK_ROOT%%/jre/lib/zi
 %%JDK_ROOT%%/lib/ct.sym
 %%JDK_ROOT%%/lib/tools.jar
-@dirrm %%JDK_ROOT%%/lib
-@dirrm %%JDK_ROOT%%/jre/lib/security
-@dirrm %%JDK_ROOT%%/jre/lib/ext
-@dirrm %%JDK_ROOT%%/jre/lib/cmm
-@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/xawt
-@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/server
-@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/headless
-%%CLIENTVM%%@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/client
-@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%
-@dirrm %%JDK_ROOT%%/jre/lib
-@dirrm %%JDK_ROOT%%/jre/bin
-@dirrm %%JDK_ROOT%%/jre
-@dirrm %%JDK_ROOT%%/include/freebsd
-@dirrm %%JDK_ROOT%%/include
-@dirrm %%JDK_ROOT%%/bin
-@dirrm %%JDK_ROOT%%

Modified: head/java/bouncycastle/pkg-plist
==============================================================================
--- head/java/bouncycastle/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/bouncycastle/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -6,4 +6,3 @@
 %%DATADIR%%/bcpg-src.zip
 %%DATADIR%%/bcprov-src.zip
 %%DATADIR%%/bctsp-src.zip
-@dirrm %%DATADIR%%

Modified: head/java/cacao/pkg-plist
==============================================================================
--- head/java/cacao/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/cacao/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -2,4 +2,3 @@ bin/cacao
 lib/libjvm.so
 man/man1/cacao.1.gz
 %%DATADIR%%/vm.zip
-@dirrm %%DATADIR%%

Modified: head/java/classpath/pkg-plist
==============================================================================
--- head/java/classpath/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/classpath/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -56,8 +56,6 @@ man/man1/grmid.1.gz
 man/man1/grmiregistry.1.gz
 man/man1/gserialver.1.gz
 man/man1/gtnameserv.1.gz
-@dirrm lib/classpath
-@dirrmtry lib/security
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.java2d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.jawt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
@@ -180,25 +178,3 @@ man/man1/gtnameserv.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/welcome.html
 %%DATADIR%%/glibj.zip
 %%DATADIR%%/tools.zip
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/swing
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/sound
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/print
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/midi
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/management
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/jawt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/java2d
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/icons
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/datatransfer
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/awt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/NamingService
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%

Modified: head/java/commonclipse/pkg-plist
==============================================================================
--- head/java/commonclipse/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/commonclipse/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -1,5 +1,2 @@
 eclipse/features/%%DISTNAME%%.jar
 eclipse/plugins/%%DISTNAME%%.jar
-@dirrmtry eclipse/plugins
-@dirrmtry eclipse/features
-@dirrmtry eclipse

Modified: head/java/cos/pkg-plist
==============================================================================
--- head/java/cos/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/cos/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -17,7 +17,6 @@
 %%DATADIR%%/doc/com/oreilly/servlet/multipart/FilePart.html
 %%DATADIR%%/doc/com/oreilly/servlet/multipart/DefaultFileRenamePolicy.html
 %%DATADIR%%/doc/com/oreilly/servlet/multipart/BufferedServletInputStream.html
-@dirrm %%DATADIR%%/doc/com/oreilly/servlet/multipart
 %%DATADIR%%/doc/com/oreilly/servlet/VersionDetector.html
 %%DATADIR%%/doc/com/oreilly/servlet/ServletUtils.html
 %%DATADIR%%/doc/com/oreilly/servlet/RemoteHttpServlet.html
@@ -39,9 +38,6 @@
 %%DATADIR%%/doc/com/oreilly/servlet/CacheHttpServlet.html
 %%DATADIR%%/doc/com/oreilly/servlet/Base64Encoder.html
 %%DATADIR%%/doc/com/oreilly/servlet/Base64Decoder.html
-@dirrm %%DATADIR%%/doc/com/oreilly/servlet
-@dirrm %%DATADIR%%/doc/com/oreilly
-@dirrm %%DATADIR%%/doc/com
 %%DATADIR%%/doc/images/blue-ball-small.gif
 %%DATADIR%%/doc/images/blue-ball.gif
 %%DATADIR%%/doc/images/class-index.gif
@@ -65,7 +61,6 @@
 %%DATADIR%%/doc/images/variables.gif
 %%DATADIR%%/doc/images/yellow-ball-small.gif
 %%DATADIR%%/doc/images/yellow-ball.gif
-@dirrm %%DATADIR%%/doc/images
 %%DATADIR%%/doc/package-list
 %%DATADIR%%/doc/packages.html
 %%DATADIR%%/doc/stylesheet.css
@@ -79,5 +74,3 @@
 %%DATADIR%%/doc/allclasses-frame.html
 %%DATADIR%%/doc/deprecated-list.html
 %%DATADIR%%/doc/upload.war
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%

Modified: head/java/cryptix-jce/pkg-plist
==============================================================================
--- head/java/cryptix-jce/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/cryptix-jce/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -4,4 +4,3 @@
 %%JAVAJARDIR%%/cryptix-jce-tests.jar
 %%PORTDOCS%%%%DOCSDIR%%/README.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT
-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Modified: head/java/dbvis/Makefile
==============================================================================
--- head/java/dbvis/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/dbvis/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -32,7 +32,7 @@ do-install:
 post-install:
 	${FIND} ${STAGEDIR}${DATADIR} -not -type d \
 	  | ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST}
-	${FIND} -d ${STAGEDIR}${DATADIR} -type d \
-	  | ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
+	${FIND} -d ${STAGEDIR}${DATADIR} -type d -empty \
+	  | ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dir ,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-EPIC/Makefile
==============================================================================
--- head/java/eclipse-EPIC/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-EPIC/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -42,8 +42,8 @@ post-install:
 .for file in ${EPICFILES}
 	@${FIND} ${WRKSRC}/${file} -type f \
 	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -d ${WRKSRC}/${file} -type d \
-	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${FIND} -d ${WRKSRC}/${file} -type d -empty \
+	  | ${SED} -ne 's,^${WRKSRC},@dir ${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-RDT/Makefile
==============================================================================
--- head/java/eclipse-RDT/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-RDT/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -56,8 +56,8 @@ post-install:
 .for FILE in ${RDTFILES}
 	@${FIND} ${WRKSRC}/${FILE} -type f \
 	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -d ${WRKSRC}/${FILE} -type d \
-	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${FIND} -d ${WRKSRC}/${FILE} -type d -empty \
+	  | ${SED} -ne 's,^${WRKSRC},@dir ${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-checkstyle/pkg-plist
==============================================================================
--- head/java/eclipse-checkstyle/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-checkstyle/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -65,10 +65,3 @@ lib/eclipse/plugins/com.atlassw.tools.ec
 lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/toc.xml
 lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xercesImpl.jar
 lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xmlParserAPIs.jar
-@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/license
-@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/images
-@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs
-@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc
-@dirrm lib/eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0
-@dirrmtry lib/eclipse/plugins
-@dirrmtry lib/eclipse

Modified: head/java/eclipse-drjava/pkg-plist
==============================================================================
--- head/java/eclipse-drjava/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-drjava/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -3,6 +3,3 @@
 %%DATADIR%%/%%EPLUGINID%%_%%PORTVERSION%%/icons/drjava16.gif
 %%DATADIR%%/%%EPLUGINID%%_%%PORTVERSION%%/icons/drjava16.png
 %%DATADIR%%/%%EPLUGINID%%_%%PORTVERSION%%/plugin.xml
-@dirrm %%DATADIR%%/%%EPLUGINID%%_%%PORTVERSION%%/META-INF
-@dirrm %%DATADIR%%/%%EPLUGINID%%_%%PORTVERSION%%/icons
-@dirrm %%DATADIR%%/%%EPLUGINID%%_%%PORTVERSION%%

Modified: head/java/eclipse-examples/pkg-plist
==============================================================================
--- head/java/eclipse-examples/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-examples/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -256,90 +256,3 @@ lib/eclipse/features/org.eclipse.sdk.exa
 lib/eclipse/features/org.eclipse.sdk.examples_3.0.0/eclipse_update_120.jpg
 lib/eclipse/features/org.eclipse.sdk.examples_3.0.0/feature.properties
 lib/eclipse/features/org.eclipse.sdk.examples_3.0.0/license.html
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons/wizban
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons/view16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons/obj16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons/etool16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons/dtool16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons/ctool16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0/doc
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.readmetool_2.1.0
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.propertysheet_2.1.0/icons/obj16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.propertysheet_2.1.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.propertysheet_2.1.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.propertysheet_2.1.0
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.multipageeditor_2.1.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.multipageeditor_2.1.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.multipageeditor_2.1.0
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.javaeditor_3.0.0/templates
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.javaeditor_3.0.0/icons/obj16
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.javaeditor_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.javaeditor_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.ui.examples.javaeditor_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.team.examples.filesystem_3.0.0/icons/full/wizban
-@dirrm lib/eclipse/plugins/org.eclipse.team.examples.filesystem_3.0.0/icons/full/wizards
-@dirrm lib/eclipse/plugins/org.eclipse.team.examples.filesystem_3.0.0/icons/full
-@dirrm lib/eclipse/plugins/org.eclipse.team.examples.filesystem_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.team.examples.filesystem_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.team.examples.filesystem_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.paint_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.paint_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.paint_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.layouts_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.layouts_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.layouts_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.launcher_3.0.0/schema
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.launcher_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.launcher_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.launcher_3.0.0/doc
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.launcher_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.controls_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.controls_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.controls_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.browser_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.browser_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.swt.examples.browser_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.ui.examples.readmetool_2.1.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.ui.examples.propertysheet_2.1.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.ui.examples.multipageeditor_2.1.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.ui.examples.javaeditor_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.team.examples.filesystem_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.swt.examples_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.swt.examples.paint_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.swt.examples.layouts_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.swt.examples.launcher_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.swt.examples.controls_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.swt.examples.browser_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.jdt.ui.examples.projects_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.compare.examples_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src/org.eclipse.compare.examples.xml_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0/src
-@dirrm lib/eclipse/plugins/org.eclipse.sdk.examples.source_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/icons/full/wizban
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/icons/full/etool16
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/icons/full/dtool16
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/icons/full
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/archive/junit
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0/archive
-@dirrm lib/eclipse/plugins/org.eclipse.jdt.ui.examples.projects_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.help.examples.ex1_3.0.0/nl/ja
-@dirrm lib/eclipse/plugins/org.eclipse.help.examples.ex1_3.0.0/nl
-@dirrm lib/eclipse/plugins/org.eclipse.help.examples.ex1_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0/icons/full/obj16
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0/icons/full
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0/icons
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0/doc-html
-@dirrm lib/eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0
-@dirrm lib/eclipse/features/org.eclipse.sdk.examples_3.0.0
-@dirrmtry lib/eclipse/plugins
-@dirrmtry lib/eclipse/features
-@dirrmtry lib/eclipse

Modified: head/java/eclipse-gef-examples/pkg-plist
==============================================================================
--- head/java/eclipse-gef-examples/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-gef-examples/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -20,13 +20,3 @@ lib/eclipse/features/org.eclipse.gef.exa
 lib/eclipse/features/org.eclipse.gef.examples_3.0.0/eclipse_update_120.jpg
 lib/eclipse/features/org.eclipse.gef.examples_3.0.0/cpl-v10.html
 lib/eclipse/features/org.eclipse.gef.examples_3.0.0/feature.properties
-@dirrm lib/eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src/org.eclipse.gef.examples.logic_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src/org.eclipse.gef.examples.flow_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.gef.examples.source_3.0.0/src
-@dirrm lib/eclipse/plugins/org.eclipse.gef.examples.source_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0
-@dirrm lib/eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0
-@dirrm lib/eclipse/features/org.eclipse.gef.examples_3.0.0
-@dirrmtry lib/eclipse/plugins
-@dirrmtry lib/eclipse/features
-@dirrmtry lib/eclipse

Modified: head/java/eclipse-hibernatetools/Makefile
==============================================================================
--- head/java/eclipse-hibernatetools/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-hibernatetools/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -43,8 +43,8 @@ generate-plist-locally: build
 	@(cd ${WRKSRC} && ${FIND} -s features plugins -not -type d) \
 		| ${SED} -ne 's,^,lib/eclipse/,p' > ${PLIST}
 # annotate installation directories
-	@(cd ${WRKSRC} && ${FIND} -s -d features plugins -type d) \
+	@(cd ${WRKSRC} && ${FIND} -s -d features plugins -type d -empty) \
 		| ${GREP} -vE '^plugins$$|^features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/eclipse/,p' >> ${PLIST}
+		| ${SED} -ne 's,^,@dir lib/eclipse/,p' >> ${PLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-hibernatetools/pkg-plist
==============================================================================
--- head/java/eclipse-hibernatetools/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-hibernatetools/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -366,32 +366,3 @@ lib/eclipse/plugins/org.jboss.tools.hibe
 lib/eclipse/plugins/org.jboss.tools.hibernate.ui.view_3.2.3.GA/plugin.properties
 lib/eclipse/plugins/org.jboss.tools.hibernate.ui.view_3.2.3.GA/plugin.xml
 lib/eclipse/plugins/org.jboss.tools.hibernate.ui.view_3.2.3.GA/view.jar
-@dirrm lib/eclipse/features/org.hibernate.eclipse.feature_3.2.3.GA
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA/META-INF
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA/doc/newandnoteworthy
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA/doc
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA/icons/images/xpl
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA/icons/images
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA/icons
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.console_3.2.3.GA
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.help_3.2.3.GA/META-INF
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.help_3.2.3.GA
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.mapper_3.2.3.GA/META-INF
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.mapper_3.2.3.GA/icons/images
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.mapper_3.2.3.GA/icons
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse.mapper_3.2.3.GA
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse_3.2.3.GA/META-INF
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse_3.2.3.GA/lib/annotations
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse_3.2.3.GA/lib/hibernate
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse_3.2.3.GA/lib/tools
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse_3.2.3.GA/lib
-@dirrm lib/eclipse/plugins/org.hibernate.eclipse_3.2.3.GA
-@dirrm lib/eclipse/plugins/org.jboss.ide.eclipse.freemarker_1.0.1.GA/META-INF
-@dirrm lib/eclipse/plugins/org.jboss.ide.eclipse.freemarker_1.0.1.GA/icons
-@dirrm lib/eclipse/plugins/org.jboss.ide.eclipse.freemarker_1.0.1.GA
-@dirrm lib/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor_3.2.3.GA/META-INF
-@dirrm lib/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor_3.2.3.GA/icons
-@dirrm lib/eclipse/plugins/org.jboss.tools.hibernate.ui.veditor_3.2.3.GA
-@dirrm lib/eclipse/plugins/org.jboss.tools.hibernate.ui.view_3.2.3.GA/META-INF
-@dirrm lib/eclipse/plugins/org.jboss.tools.hibernate.ui.view_3.2.3.GA/images
-@dirrm lib/eclipse/plugins/org.jboss.tools.hibernate.ui.view_3.2.3.GA

Modified: head/java/eclipse-log4e/Makefile
==============================================================================
--- head/java/eclipse-log4e/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-log4e/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -25,8 +25,8 @@ do-install:
 	@${CP} -r ${WRKSRC}/features ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s features plugins -not -type d) \
 		| ${SED} -ne 's,^,lib/eclipse/,p' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d features plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d features plugins -type d -empty) \
 		| ${GREP} -vE 'plugins$$|features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/eclipse/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/eclipse/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-lomboz/Makefile
==============================================================================
--- head/java/eclipse-lomboz/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-lomboz/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -31,8 +31,8 @@ do-install:
 	@${CP} -r ${WRKSRC}/eclipse/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 	@${CP} -r ${WRKSRC}/eclipse/features ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d -empty) \
 		| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-ocl/Makefile
==============================================================================
--- head/java/eclipse-ocl/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-ocl/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -29,8 +29,8 @@ do-install:
 	@${CP} -r ${WRKSRC}/eclipse/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 	@${CP} -r ${WRKSRC}/eclipse/features ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d -empty) \
 		| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-pmd/pkg-plist
==============================================================================
--- head/java/eclipse-pmd/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-pmd/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -42,11 +42,3 @@ lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/p
 lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/pmd-eclipse.jar
 lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/toc.xml
 lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/welcome.xml
-@dirrm lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/nl/fr
-@dirrm lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/nl
-@dirrm lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/lib
-@dirrm lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%/icons
-@dirrm lib/eclipse/plugins/%%PLUGIN_PMD_DIR%%
-@dirrm lib/eclipse/plugins/%%PLUGIN_CORE_DIR%%/lib
-@dirrm lib/eclipse/plugins/%%PLUGIN_CORE_DIR%%
-@dirrm lib/eclipse/features/%%PLUGIN_PMD_DIR%%

Modified: head/java/eclipse-propedit/Makefile
==============================================================================
--- head/java/eclipse-propedit/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-propedit/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -28,8 +28,8 @@ do-install:
 	@${CP} -r ${WRKSRC}/eclipse/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 	@${CP} -r ${WRKSRC}/eclipse/features ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d -empty) \
 		| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-quantum/pkg-plist
==============================================================================
--- head/java/eclipse-quantum/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-quantum/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -258,23 +258,3 @@ lib/eclipse/plugins/com.quantum.help_%%V
 lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/toc.xml
 lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/working_bookmarks.html
 lib/eclipse/plugins/com.quantum.help_%%VERSION%%/plugin.xml
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/images/quantum_new_bookmark
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/images/quantum_extender_plugin
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/images
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/changelog/images
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc/changelog
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%/doc
-@dirrm lib/eclipse/plugins/com.quantum.help_%%VERSION%%
-@dirrm lib/eclipse/plugins/com.quantum.flatfiles_%%VERSION%%/icons
-@dirrm lib/eclipse/plugins/com.quantum.flatfiles_%%VERSION%%
-@dirrm lib/eclipse/plugins/com.quantum.dbunit_%%VERSION%%/icons
-@dirrm lib/eclipse/plugins/com.quantum.dbunit_%%VERSION%%
-@dirrm lib/eclipse/plugins/com.quantum.Quantum_%%VERSION%%/schema
-@dirrm lib/eclipse/plugins/com.quantum.Quantum_%%VERSION%%/lib
-@dirrm lib/eclipse/plugins/com.quantum.Quantum_%%VERSION%%/icons/unused
-@dirrm lib/eclipse/plugins/com.quantum.Quantum_%%VERSION%%/icons
-@dirrm lib/eclipse/plugins/com.quantum.Quantum_%%VERSION%%
-@dirrm lib/eclipse/features/com.quantum.help.feature_%%VERSION%%
-@dirrm lib/eclipse/features/com.quantum.flatfiles.feature_%%VERSION%%
-@dirrm lib/eclipse/features/com.quantum.feature_%%VERSION%%
-@dirrm lib/eclipse/features/com.quantum.dbunit.feature_%%VERSION%%

Modified: head/java/eclipse-shelled/Makefile
==============================================================================
--- head/java/eclipse-shelled/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-shelled/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -30,9 +30,9 @@ do-install:
 	@${CP} -r ${WRKSRC}/eclipse/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 	@${CP} -r ${WRKSRC}/eclipse/features ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d -empty) \
 		| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 	@${MV} ${WRKSRC}/eclipse/plugins ${WRKSRC}/plugins
 	@${MV} ${WRKSRC}/eclipse/features ${WRKSRC}/features
 	@${RM} -rf ${WRKSRC}/eclipse

Modified: head/java/eclipse-sqlexplorer/Makefile
==============================================================================
--- head/java/eclipse-sqlexplorer/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-sqlexplorer/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -25,8 +25,8 @@ do-install:
 	@${CP} -r ${WRKSRC}/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s plugins -not -type d) \
 		| ${SED} -ne 's,^,lib/eclipse/,p' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d plugins -type d -empty) \
 		| ${GREP} -vE '^plugins$$' \
-		| ${SED} -ne 's,^,@dirrm lib/eclipse/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/eclipse/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-sysdeo-tomcat/Makefile
==============================================================================
--- head/java/eclipse-sysdeo-tomcat/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-sysdeo-tomcat/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -25,7 +25,7 @@ do-install:
 	@${CP} -r ${WRKSRC}/com.sysdeo.eclipse.tomcat_${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/eclipse/plugins
 	@(cd ${WRKSRC}; ${FIND} -s com.sysdeo.eclipse.tomcat_${PORTVERSION} -not -type d) \
 		| ${SED} -ne 's,^,lib/eclipse/plugins/,p' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d com.sysdeo.eclipse.tomcat_${PORTVERSION} -type d) \
-		| ${SED} -ne 's,^,@dirrm lib/eclipse/plugins/,p' >> ${TMPPLIST}
+	@(cd ${WRKSRC}; ${FIND} -s -d com.sysdeo.eclipse.tomcat_${PORTVERSION} -type d -empty) \
+		| ${SED} -ne 's,^,@dir lib/eclipse/plugins/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-uml/Makefile
==============================================================================
--- head/java/eclipse-uml/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-uml/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -28,8 +28,8 @@ do-install:
 	@${CP} -r ${WRKSRC}/eclipse/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 	@${CP} -r ${WRKSRC}/eclipse/features ${STAGEDIR}${PREFIX}/lib/eclipse
 	@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
-	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+	@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d -empty) \
 		| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-		| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
+		| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-vep-examples/pkg-plist
==============================================================================
--- head/java/eclipse-vep-examples/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-vep-examples/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -37,25 +37,3 @@ lib/eclipse/features/org.eclipse.ve.exam
 lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/eclipse_update_120.jpg
 lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/license.html
 lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.properties
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/src
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java/vm
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples/java
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve/examples
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse/ve
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org/eclipse
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides/org
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/overrides
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/images
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/icons
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%/examples
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/META-INF
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%/vm
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src
-@dirrm lib/eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%
-@dirrm lib/eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@dirrmtry lib/eclipse/plugins
-@dirrmtry lib/eclipse/features
-@dirrmtry lib/eclipse

Modified: head/java/eclipse-vep/Makefile
==============================================================================
--- head/java/eclipse-vep/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-vep/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -31,8 +31,8 @@ do-install:
 		@${CP} -r ${WRKSRC}/eclipse/plugins ${STAGEDIR}${PREFIX}/lib/eclipse
 		@${CP} -r ${WRKSRC}/eclipse/features ${STAGEDIR}${PREFIX}/lib/eclipse
 		@(cd ${WRKSRC}; ${FIND} -s eclipse/features eclipse/plugins -not -type d) | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST}
-		@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d) \
+		@(cd ${WRKSRC}; ${FIND} -s -d eclipse/features eclipse/plugins -type d -empty) \
 			| ${GREP} -vE 'eclipse/plugins$$|eclipse/features$$' \
-			| ${SED} -ne 's,^,@dirrm lib/,p' >> ${TMPPLIST}
+			| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse-viplugin/pkg-plist
==============================================================================
--- head/java/eclipse-viplugin/pkg-plist	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse-viplugin/pkg-plist	Fri Nov 14 11:30:42 2014	(r372556)
@@ -26,11 +26,3 @@ lib/eclipse/plugins/viPluginHelp_%%RELEA
 lib/eclipse/plugins/viPluginHelp_%%RELEASEVERSION%%/plugin.xml
 lib/eclipse/plugins/viPluginHelp_%%RELEASEVERSION%%/testToc.xml
 lib/eclipse/plugins/viPluginHelp_%%RELEASEVERSION%%/toc.xml
-@dirrm lib/eclipse/plugins/ViPluginEclipseLayer_%%RELEASEVERSION%%/lib
-@dirrm lib/eclipse/plugins/ViPluginEclipseLayer_%%RELEASEVERSION%%/icons
-@dirrm lib/eclipse/plugins/ViPluginEclipseLayer_%%RELEASEVERSION%%/doc
-@dirrm lib/eclipse/plugins/ViPluginEclipseLayer_%%RELEASEVERSION%%
-@dirrm lib/eclipse/plugins/viPluginHelp_%%RELEASEVERSION%%/META-INF
-@dirrm lib/eclipse/plugins/viPluginHelp_%%RELEASEVERSION%%/html
-@dirrm lib/eclipse/plugins/viPluginHelp_%%RELEASEVERSION%%
-@dirrm lib/eclipse/features/viPluginFeature_%%RELEASEVERSION%%

Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse/Makefile	Fri Nov 14 11:30:42 2014	(r372556)
@@ -112,16 +112,11 @@ do-install:
 	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/eclipse.tmp ${STAGEDIR}${PREFIX}/bin/eclipse
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s lib/eclipse -not -type d) >> ${TMPPLIST}
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s bin/eclipse -not -type d) >> ${TMPPLIST}
-	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${MKDIR} %D/lib/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${MKDIR} %D/share/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST}
+	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d -empty) | ${SED} -ne "s,^,@dir ,p" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec echo '-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%D/share/eclipse/dropins' >> %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${SED} -i '' '/^-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/d' %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm share/eclipse/dropins" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm share/eclipse" >> ${TMPPLIST}
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins
+	@${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST}
 
 distclean:
 	${RM} -rf ${DISTDIR}/eclipse

Modified: head/java/eclipse/Makefile.plugins
==============================================================================
--- head/java/eclipse/Makefile.plugins	Fri Nov 14 09:39:21 2014	(r372555)
+++ head/java/eclipse/Makefile.plugins	Fri Nov 14 11:30:42 2014	(r372556)
@@ -10,5 +10,5 @@ do-install:
 		@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse
 		@(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/)
 		@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST}
-		@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d) \
-			| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
+		@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d -empty) \
+			| ${SED} -ne 's,^,@dir ,p' >> ${TMPPLIST}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411141130.sAEBUgtH085214>