4 files changed, 7 insertions, 55 deletions

diff --git a/www/eliom/pkg-plist b/www/eliom/pkg-plist
index 51f0f21ac971..7b82be0f4bda 100644
--- a/www/eliom/pkg-plist
+++ b/www/eliom/pkg-plist
@@ -16,9 +16,3 @@ share/eliom/destillery/basic/PROJECT_NAME.conf.in
 share/eliom/destillery/basic/PROJECT_NAME.eliom
 share/eliom/destillery/basic/README
 share/eliom/destillery/basic/static!css!PROJECT_NAME.css
-@dirrm share/eliom/destillery/basic
-@dirrm share/eliom/destillery
-@dirrm share/eliom
-@dirrm %%OCAML_SITELIBDIR%%/eliom/syntax
-@dirrm %%OCAML_SITELIBDIR%%/eliom/server
-@dirrm %%OCAML_SITELIBDIR%%/eliom/client
diff --git a/www/geneweb/pkg-plist b/www/geneweb/pkg-plist
index bec43b1ec7c1..8465442bd8d3 100644
--- a/www/geneweb/pkg-plist
+++ b/www/geneweb/pkg-plist
@@ -655,39 +655,4 @@ man/man1/gwu.1.gz
 %%DATADIR%%/lang/start.txt
 %%DATADIR%%/lang/start_utf8.txt
 %%DATADIR%%/lang/version.txt
-@dirrm %%DATADIR%%/distribution/gw/etc/perso_module
-@dirrm %%DATADIR%%/distribution/gw/etc/templ502
-@dirrm %%DATADIR%%/distribution/gw/etc/templa
-@dirrm %%DATADIR%%/distribution/gw/etc/templb
-@dirrm %%DATADIR%%/distribution/gw/etc/templc
-@dirrm %%DATADIR%%/distribution/gw/etc/templd
-@dirrm %%DATADIR%%/distribution/gw/etc/templf
-@dirrm %%DATADIR%%/distribution/gw/etc/templh
-@dirrm %%DATADIR%%/distribution/gw/etc/templm
-@dirrm %%DATADIR%%/distribution/gw/etc/templx
-@dirrm %%DATADIR%%/distribution/gw/etc
-@dirrm %%DATADIR%%/distribution/gw/gwtp_tmp/lang
-@dirrm %%DATADIR%%/distribution/gw/gwtp_tmp
-@dirrm %%DATADIR%%/distribution/gw/images/flags
-@dirrm %%DATADIR%%/distribution/gw/images
-@dirrm %%DATADIR%%/distribution/gw/lang
-@dirrmtry %%DATADIR%%/distribution/gw/old
-@dirrm %%DATADIR%%/distribution/gw/setup/lang
-@dirrm %%DATADIR%%/distribution/gw/setup
-@dirrm %%DATADIR%%/distribution/gw
-@dirrm %%DATADIR%%/distribution
-@dirrm %%DATADIR%%/etc/perso_module
-@dirrm %%DATADIR%%/etc/templ502
-@dirrm %%DATADIR%%/etc/templa
-@dirrm %%DATADIR%%/etc/templb
-@dirrm %%DATADIR%%/etc/templc
-@dirrm %%DATADIR%%/etc/templd
-@dirrm %%DATADIR%%/etc/templf
-@dirrm %%DATADIR%%/etc/templh
-@dirrm %%DATADIR%%/etc/templm
-@dirrm %%DATADIR%%/etc/templx
-@dirrm %%DATADIR%%/etc
-@dirrm %%DATADIR%%/images/flags
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/distribution/gw/old
diff --git a/www/ocsigen/files/patch-Makefile b/www/ocsigen/files/patch-Makefile
index 55d838d5dce7..9e543e8bc775 100644
--- a/www/ocsigen/files/patch-Makefile
+++ b/www/ocsigen/files/patch-Makefile
@@ -54,12 +54,12 @@
 -	$(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(STATICPAGESDIR)
 -	$(INSTALL) -d -m ${INSTALL_MOD_750} ${INSTALL_USER_GROUP} $(TEMPROOT)$(DATADIR)
 -	$(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
-+	$(BSD_INSTALL_DATA) -d $(TEMPROOT)$(STATICPAGESDIR)
-+	$(BSD_INSTALL_DATA) -d $(TEMPROOT)$(DATADIR)
++	mkdir -p $(TEMPROOT)$(STATICPAGESDIR)
++	mkdir -p $(TEMPROOT)$(DATADIR)
 +	$(BSD_INSTALL_DATA) \
  	  local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
 -	$(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \
-+	$(BSD_INSTALL_DATA) -d \
++	mkdir -p \
  	  $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
 -	$(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
 +	$(BSD_INSTALL_DATA) \
@@ -67,7 +67,7 @@
  	  $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
 -	$(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR)
 -	$(INSTALL) -m ${INSTALL_MOD_644} src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
-+	$(BSD_INSTALL_MAN) -d $(TEMPROOT)$(MANDIR)
++	mkdir -p $(TEMPROOT)$(MANDIR)
 +	$(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
  
  uninstall:
diff --git a/www/ocsigen/pkg-plist b/www/ocsigen/pkg-plist
index a839b797249a..03817637ba63 100644
--- a/www/ocsigen/pkg-plist
+++ b/www/ocsigen/pkg-plist
@@ -1,8 +1,6 @@
 bin/ocsigenserver
 bin/ocsigenserver.opt
-@unexec if cmp -s %D/etc/ocsigenserver.conf.sample %D/etc/ocsigenserver.conf; then rm -f %D/etc/ocsigenserver.conf; fi
-etc/ocsigenserver.conf.sample
-@exec if [ ! -f %D/etc/ocsigenserver.conf ] ; then cp -p %D/%F %B/ocsigenserver.conf; fi
+@sample etc/ocsigenserver.conf.sample
 etc/mime.types
 man/man1/ocsigenserver.1.gz
 share/ocsigen/www/index.html
@@ -30,9 +28,4 @@ share/ocsigen/www/ocsigenstuff/txt.png
 share/ocsigen/www/ocsigenstuff/unknown.png
 share/ocsigen/www/ocsigenstuff/video.png
 share/ocsigen/www/ocsigenstuff/style.css
-@dirrm %%OCAML_SITELIBDIR%%/ocsigenserver/extensions
-@dirrm share/ocsigen/www/ocsigenstuff
-@dirrm share/ocsigen/www
-@dirrm share/ocsigen
-@dirrmtry var/ocsigen
-@dirrmtry var
+@dir var/ocsigen