- Stagify

- Convert to USES=libtool
- Use new LIB_DEPENDS syntax
- Optionize docs installation
- Use canonical patch names

lang/ferite/Makefile

@@ -3,38 +3,38 @@
 
 PORTNAME=	ferite
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An embeddable scripting language
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOTOOLS=	libtool
-USES=		gmake
+USES=		gmake libtool
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 USE_LDCONFIG=	yes
 PLIST_SUB=	MACHINE_ARCH=${MACHINE_ARCH}
+INSTALL_TARGET=	install-strip
 
-MAN1=		builder.1 ferite.1
 PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MDOCS}
+MAKE_ENV+=	NOPORTDOCS=1
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<stdint\.h>|<inttypes.h>|' \
 		${WRKSRC}/src/ferite_scanner.c
 	@${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \
-	${REINPLACE_CMD} -e "s|-lferite|-lferite -L${WRKSRC}/src/.libs|g"
+		${REINPLACE_CMD} -e "s|-lferite|-lferite -L${WRKSRC}/src/.libs|g"
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=${NOPORTDOCS}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

lang/ferite/files/patch-docs::Makefile.in

@@ -1,18 +0,0 @@
---- docs/Makefile.in.orig	Thu Jan  9 04:49:26 2003
-+++ docs/Makefile.in	Tue Jan 14 09:43:14 2003
-@@ -212,6 +212,7 @@
- 	done
- docsDATA_INSTALL = $(INSTALL_DATA)
- install-docsDATA: $(docs_DATA)
-+ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(docsdir)
- 	@list='$(docs_DATA)'; for p in $$list; do \
-@@ -220,6 +221,7 @@
- 	  echo " $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f"; \
- 	  $(docsDATA_INSTALL) $$d$$p $(DESTDIR)$(docsdir)/$$f; \
- 	done
-+endif
- 
- uninstall-docsDATA:
- 	@$(NORMAL_UNINSTALL)

lang/ferite/files/patch-docs__Makefile.in

@@ -0,0 +1,42 @@
+--- docs/Makefile.in.orig	2005-12-05 15:06:18.000000000 +0300
++++ docs/Makefile.in	2014-05-27 21:33:24.000000000 +0400
+@@ -347,6 +347,7 @@
+ 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+ install-docsDATA: $(docs_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(docsdir)" || $(mkdir_p) "$(DESTDIR)$(docsdir)"
+ 	@list='$(docs_DATA)'; for p in $$list; do \
+@@ -355,6 +356,7 @@
+ 	  echo " $(docsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docsdir)/$$f'"; \
+ 	  $(docsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docsdir)/$$f"; \
+ 	done
++endif
+ 
+ uninstall-docsDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -639,17 +641,17 @@
+ 
+ 
+ capi:
+-	rm -rf generated/capi && $(srcdir)/build_c_api_docs.sh $(prefix)/bin/
++	rm -rf generated/capi && $(srcdir)/build_c_api_docs.sh ${DESTDIR}$(prefix)/bin/
+ 
+ install-data-local: capi
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(prefix)/share/doc/ferite/api; \
+-	$(prefix)/bin/feritedoc --regenerate; \
++	$(mkinstalldirs) ${DESTDIR}$(prefix)/share/doc/ferite/api; \
++	${DESTDIR}$(prefix)/bin/feritedoc --regenerate; \
+ 	if test -d $(srcdir)/generated/capi; then \
+-	  $(mkinstalldirs) $(prefix)/share/doc/ferite/capi; \
+-	  (cd $(srcdir)/generated; tar -cf - capi) | (cd $(prefix)/share/doc/ferite/; tar -xf -) \
++	  $(mkinstalldirs) ${DESTDIR}$(prefix)/share/doc/ferite/capi; \
++	  (cd $(srcdir)/generated; tar -cf - capi) | (cd ${DESTDIR}$(prefix)/share/doc/ferite/; tar -xf -) \
+ 	fi; \
+-	(cd $(srcdir); tar -cf - html-manuals) | (cd $(prefix)/share/doc/ferite/; tar -xf -)
++	(cd $(srcdir); tar -cf - html-manuals) | (cd ${DESTDIR}$(prefix)/share/doc/ferite/; tar -xf -)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

lang/ferite/pkg-plist

@@ -1,158 +1,176 @@
 bin/builder
-bin/ferite
-bin/generate-module
-bin/feritedoc
 bin/farm
+bin/ferite
+bin/ferite-config
+bin/feritedoc
+bin/generate-module
 bin/manual-builder-html
 bin/manual-builder-pdf
-bin/ferite-config
+include/ferite.h
+include/ferite/farray.h
+include/ferite/fbuffer.h
 include/ferite/fcompile.h
-include/ferite/fstring.h
 include/ferite/fdebug.h
+include/ferite/ferror.h
 include/ferite/ffunction.h
+include/ferite/fgc.h
 include/ferite/fglobals.h
+include/ferite/fhash.h
 include/ferite/fmem.h
+include/ferite/fmem_jedi.h
+include/ferite/fmodule.h
+include/ferite/fns.h
+include/ferite/fobj.h
 include/ferite/foop.h
 include/ferite/fopcode.h
 include/ferite/fops.h
 include/ferite/fparser.h
+include/ferite/fregex.h
 include/ferite/freq.h
 include/ferite/fstack.h
+include/ferite/fstring.h
 include/ferite/fstructs.h
-include/ferite/futils.h
-include/ferite/farray.h
-include/ferite/fgc.h
-include/ferite/fhash.h
-include/ferite/fmodule.h
-include/ferite/fregex.h
-include/ferite/ferror.h
-include/ferite/fns.h
-include/ferite/fvariables.h
-include/ferite/fbuffer.h
 include/ferite/fthread.h
-include/ferite/fobj.h
+include/ferite/futils.h
+include/ferite/fvariables.h
 include/ferite/stream/util_stream.h
-include/ferite/fmem_jedi.h
-include/ferite.h
-lib/libferite.a
-lib/libferite.la
-lib/libferite.so
-lib/libferite.so.1
-lib/ferite/module-source/rmi/transport/tcpip.fe
-lib/ferite/module-source/rmi/transport/debug.fe
-lib/ferite/module-source/rmi/translation/std.fe
-lib/ferite/module-source/rmi/protocol/std.fe
-lib/ferite/module-source/rmi/RMIProtocolLayer.fe
-lib/ferite/module-source/rmi/RMIRemoteObject.fe
-lib/ferite/module-source/rmi/RMITranslationLayer.fe
-lib/ferite/module-source/rmi/RMITransportLayer.fe
-lib/ferite/module-source/rmi/RMILocalVariable.fe
-lib/ferite/module-source/rmi.fe
-lib/ferite/module-source/stream.fec
-lib/ferite/module-source/array.fec
-lib/ferite/module-source/console.fec
-lib/ferite/module-source/date.fec
-lib/ferite/module-source/filesystem.fec
-lib/ferite/module-source/ipc.fec
-lib/ferite/module-source/complex.fec
-lib/ferite/module-source/math.fec
-lib/ferite/module-source/network.fec
-lib/ferite/module-source/posix.fec
-lib/ferite/module-source/posix_consts.fec
-lib/ferite/module-source/reflection.fec
-lib/ferite/module-source/regexp.fec
-lib/ferite/module-source/serialize.fec
-lib/ferite/module-source/string.fec
-lib/ferite/module-source/env.fec
-lib/ferite/module-source/std.fec
-lib/ferite/module-source/sys.fec
-lib/ferite/module-source/test.fec
-lib/ferite/module-source/thread.fec
-lib/ferite/module-source/unix.fec
-lib/ferite/module-source/syslog.fec
-lib/ferite/module-source/xml.fec
-lib/ferite/module-source/unixsocket.fec
-lib/ferite/module-source/cgi/cgi.fe
-lib/ferite/module-source/cgi/cookies.fe
-lib/ferite/module-source/cgi/template.fe
-lib/ferite/module-source/GetOptLong.fe
-lib/ferite/module-source/freezethaw.fe
-lib/ferite/module-descriptions/rmi.xml
-lib/ferite/module-descriptions/stream.xml
 lib/ferite/module-descriptions/array.xml
 lib/ferite/module-descriptions/console.xml
 lib/ferite/module-descriptions/date.xml
 lib/ferite/module-descriptions/filesystem.xml
 lib/ferite/module-descriptions/ipc.xml
 lib/ferite/module-descriptions/math.xml
+lib/ferite/module-descriptions/misc.xml
 lib/ferite/module-descriptions/network.xml
 lib/ferite/module-descriptions/posix.xml
 lib/ferite/module-descriptions/reflection.xml
 lib/ferite/module-descriptions/regexp.xml
+lib/ferite/module-descriptions/rmi.xml
 lib/ferite/module-descriptions/serialize.xml
+lib/ferite/module-descriptions/stream.xml
 lib/ferite/module-descriptions/string.xml
 lib/ferite/module-descriptions/sys.xml
 lib/ferite/module-descriptions/test.xml
 lib/ferite/module-descriptions/thread.xml
 lib/ferite/module-descriptions/unix.xml
 lib/ferite/module-descriptions/xml.xml
-lib/ferite/module-descriptions/misc.xml
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/stream.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/stream.la
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/stream.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/array.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/array.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/array.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/date.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/date.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/date.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/filesystem.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/filesystem.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/filesystem.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/ipc.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/ipc.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/ipc.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/math.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/math.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/math.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/network.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/network.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/network.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/posix.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/posix.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/posix.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/reflection.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/reflection.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/reflection.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/regexp.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/regexp.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/regexp.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/serialize.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/serialize.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/serialize.so
+lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/stream.a
+lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/stream.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/string.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/string.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/string.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/sys.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/sys.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/sys.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/test.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/test.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/test.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/thread.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/thread.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/thread.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/unix.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/unix.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/unix.so
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/xml.a
-lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/xml.la
 lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%/xml.so
+lib/ferite/module-source/GetOptLong.fe
+lib/ferite/module-source/array.fec
+lib/ferite/module-source/cgi/cgi.fe
+lib/ferite/module-source/cgi/cookies.fe
+lib/ferite/module-source/cgi/template.fe
+lib/ferite/module-source/complex.fec
+lib/ferite/module-source/console.fec
+lib/ferite/module-source/date.fec
+lib/ferite/module-source/env.fec
+lib/ferite/module-source/filesystem.fec
+lib/ferite/module-source/freezethaw.fe
+lib/ferite/module-source/ipc.fec
+lib/ferite/module-source/math.fec
+lib/ferite/module-source/network.fec
+lib/ferite/module-source/posix.fec
+lib/ferite/module-source/posix_consts.fec
+lib/ferite/module-source/reflection.fec
+lib/ferite/module-source/regexp.fec
+lib/ferite/module-source/rmi.fe
+lib/ferite/module-source/rmi/RMILocalVariable.fe
+lib/ferite/module-source/rmi/RMIProtocolLayer.fe
+lib/ferite/module-source/rmi/RMIRemoteObject.fe
+lib/ferite/module-source/rmi/RMITranslationLayer.fe
+lib/ferite/module-source/rmi/RMITransportLayer.fe
+lib/ferite/module-source/rmi/protocol/std.fe
+lib/ferite/module-source/rmi/translation/std.fe
+lib/ferite/module-source/rmi/transport/debug.fe
+lib/ferite/module-source/rmi/transport/tcpip.fe
+lib/ferite/module-source/serialize.fec
+lib/ferite/module-source/std.fec
+lib/ferite/module-source/stream.fec
+lib/ferite/module-source/string.fec
+lib/ferite/module-source/sys.fec
+lib/ferite/module-source/syslog.fec
+lib/ferite/module-source/test.fec
+lib/ferite/module-source/thread.fec
+lib/ferite/module-source/unix.fec
+lib/ferite/module-source/unixsocket.fec
+lib/ferite/module-source/xml.fec
+lib/libferite.a
+lib/libferite.so
+lib/libferite.so.1
+lib/libferite.so.1.0.0
 lib/libferitestream.a
-lib/libferitestream.la
 lib/libferitestream.so
 lib/libferitestream.so.1
+lib/libferitestream.so.1.0.0
+man/man1/builder.1.gz
+man/man1/ferite.1.gz
 share/aclocal/ferite.m4
+%%PORTDOCS%%%%DATADIR%%/doc/annotate-code.fe
+%%PORTDOCS%%%%DATADIR%%/doc/deannotate-code.fe
+%%PORTDOCS%%%%DATADIR%%/doc/doc.fe
+%%PORTDOCS%%%%DATADIR%%/doc/parser.fe
+%%PORTDOCS%%%%DATADIR%%/doc/structs.fe
+%%PORTDOCS%%%%DATADIR%%/doc/template.fe
+%%DATADIR%%/farm/Actions.fe
+%%DATADIR%%/farm/Targets.fe
+%%DATADIR%%/farm/Yard.fe
+%%DATADIR%%/farm/farm.fe
+%%DATADIR%%/farm/rulesets/Darwin.fe
+%%DATADIR%%/farm/rulesets/Linux.fe
+%%DATADIR%%/farm/rulesets/RuleSets.fe
+%%DATADIR%%/generate-module/generate-module.fe
+%%DATADIR%%/generate-module/skel/AUTHORS
+%%DATADIR%%/generate-module/skel/ChangeLog
+%%DATADIR%%/generate-module/skel/Makefile.am
+%%DATADIR%%/generate-module/skel/README
+%%DATADIR%%/generate-module/skel/autogen.sh
+%%DATADIR%%/generate-module/skel/config.h.in
+%%DATADIR%%/generate-module/skel/configure.ac
+%%DATADIR%%/generate-module/skel/stamp-h.in
+%%DATADIR%%/generate-module/skel/udcl.sh
+%%DATADIR%%/manual-builder/ManualBuilder/DocUtils.feh
+%%DATADIR%%/manual-builder/ManualBuilder/DocumentFilter.feh
+%%DATADIR%%/manual-builder/ManualBuilder/Filters/HTML.feh
+%%DATADIR%%/manual-builder/ManualBuilder/Filters/PDF.feh
+%%DATADIR%%/manual-builder/ManualBuilder/Support/CSS/Default.css
+%%DATADIR%%/manual-builder/ManualBuilder/Support/Images/docs-background.png
+%%DATADIR%%/manual-builder/ManualBuilder/Support/Images/http-int.png
+%%DATADIR%%/manual-builder/ManualBuilder/Support/Images/http.png
+%%DATADIR%%/manual-builder/manual-builder.fe
+%%DATADIR%%/test-suite/README
 %%DATADIR%%/test-suite/array.fe
 %%DATADIR%%/test-suite/console.fe
 %%DATADIR%%/test-suite/date.fe
@@ -171,61 +189,28 @@ share/aclocal/ferite.m4
 %%DATADIR%%/test-suite/thread.fe
 %%DATADIR%%/test-suite/unix.fe
 %%DATADIR%%/test-suite/xml.fe
-%%DATADIR%%/test-suite/README
-%%DATADIR%%/generate-module/skel/AUTHORS
-%%DATADIR%%/generate-module/skel/autogen.sh
-%%DATADIR%%/generate-module/skel/ChangeLog
-%%DATADIR%%/generate-module/skel/config.h.in
-%%DATADIR%%/generate-module/skel/configure.ac
-%%DATADIR%%/generate-module/skel/Makefile.am
-%%DATADIR%%/generate-module/skel/README
-%%DATADIR%%/generate-module/skel/stamp-h.in
-%%DATADIR%%/generate-module/skel/udcl.sh
-%%DATADIR%%/generate-module/generate-module.fe
-%%DATADIR%%/doc/deannotate-code.fe
-%%DATADIR%%/doc/annotate-code.fe
-%%DATADIR%%/doc/parser.fe
-%%DATADIR%%/doc/structs.fe
-%%DATADIR%%/doc/doc.fe
-%%DATADIR%%/doc/template.fe
-%%DATADIR%%/farm/rulesets/RuleSets.fe
-%%DATADIR%%/farm/rulesets/Darwin.fe
-%%DATADIR%%/farm/rulesets/Linux.fe
-%%DATADIR%%/farm/farm.fe
-%%DATADIR%%/farm/Actions.fe
-%%DATADIR%%/farm/Targets.fe
-%%DATADIR%%/farm/Yard.fe
-%%DATADIR%%/manual-builder/ManualBuilder/Filters/HTML.feh
-%%DATADIR%%/manual-builder/ManualBuilder/Filters/PDF.feh
-%%DATADIR%%/manual-builder/ManualBuilder/Support/Images/docs-background.png
-%%DATADIR%%/manual-builder/ManualBuilder/Support/Images/http-int.png
-%%DATADIR%%/manual-builder/ManualBuilder/Support/Images/http.png
-%%DATADIR%%/manual-builder/ManualBuilder/Support/CSS/Default.css
-%%DATADIR%%/manual-builder/ManualBuilder/DocumentFilter.feh
-%%DATADIR%%/manual-builder/ManualBuilder/DocUtils.feh
-%%DATADIR%%/manual-builder/manual-builder.fe
-@dirrm include/ferite/stream
-@dirrm include/ferite
+@dirrm %%DATADIR%%/test-suite
+@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Support/Images
+@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Support/CSS
+@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Support
+@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Filters
+@dirrm %%DATADIR%%/manual-builder/ManualBuilder
+@dirrm %%DATADIR%%/manual-builder
+@dirrm %%DATADIR%%/generate-module/skel
+@dirrm %%DATADIR%%/generate-module
+@dirrm %%DATADIR%%/farm/rulesets
+@dirrm %%DATADIR%%/farm
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%
 @dirrm lib/ferite/module-source/rmi/transport
 @dirrm lib/ferite/module-source/rmi/translation
 @dirrm lib/ferite/module-source/rmi/protocol
 @dirrm lib/ferite/module-source/rmi
 @dirrm lib/ferite/module-source/cgi
 @dirrm lib/ferite/module-source
-@dirrm lib/ferite/module-descriptions
 @dirrm lib/ferite/module-native/freebsd%%OSREL%%-%%MACHINE_ARCH%%
 @dirrm lib/ferite/module-native
+@dirrm lib/ferite/module-descriptions
 @dirrm lib/ferite
-@dirrm %%DATADIR%%/test-suite
-@dirrm %%DATADIR%%/generate-module/skel
-@dirrm %%DATADIR%%/generate-module
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/farm/rulesets
-@dirrm %%DATADIR%%/farm
-@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Filters
-@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Support/Images
-@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Support/CSS
-@dirrm %%DATADIR%%/manual-builder/ManualBuilder/Support
-@dirrm %%DATADIR%%/manual-builder/ManualBuilder
-@dirrm %%DATADIR%%/manual-builder
-@dirrm %%DATADIR%%
+@dirrm include/ferite/stream
+@dirrm include/ferite