diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 94fb21674386..71b8da065f94 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,41 +1,41 @@
 # New ports collection makefile for:   libsigc++
 # Date created:        27 January 2000
 # Whom:                Joe Lu <JoeLu@JoeLu.m8.ntu.edu.tw>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libsigc++
 PORTVERSION=	1.0.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	libsigc \
 			sources/libsigc++/1.0
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Callback Framework for C++
 
 USE_INC_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/API ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/UML ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/conventions ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/diagrams ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/marshal ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/powerusers ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/requirements ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/riscos ${PREFIX}/share/doc/libsigc++/
-	${INSTALL_DATA} ${WRKSRC}/doc/signals ${PREFIX}/share/doc/libsigc++
-	${INSTALL_DATA} ${WRKSRC}/doc/win32 ${PREFIX}/share/doc/libsigc++
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/FEATURES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/API ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/UML ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/conventions ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/diagrams ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/marshal ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/powerusers ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/requirements ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/riscos ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/signals ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/win32 ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libsigc++/pkg-plist b/devel/libsigc++/pkg-plist
index 80311da78d3c..74ee3142e38b 100644
--- a/devel/libsigc++/pkg-plist
+++ b/devel/libsigc++/pkg-plist
@@ -1,54 +1,54 @@
 bin/sigc-config
 include/sigc++-1.0/sigc++/adaptor.h
 include/sigc++-1.0/sigc++/basic_signal.h
 include/sigc++-1.0/sigc++/bind.h
 include/sigc++-1.0/sigc++/class_slot.h
 include/sigc++-1.0/sigc++/convert.h
 include/sigc++-1.0/sigc++/func_slot.h
 include/sigc++-1.0/sigc++/generator.h
 include/sigc++-1.0/sigc++/handle.h
 include/sigc++-1.0/sigc++/handle_system.h
 include/sigc++-1.0/sigc++/marshal.h
 include/sigc++-1.0/sigc++/object.h
 include/sigc++-1.0/sigc++/object_slot.h
 include/sigc++-1.0/sigc++/retbind.h
 include/sigc++-1.0/sigc++/rettype.h
 include/sigc++-1.0/sigc++/scope.h
 include/sigc++-1.0/sigc++/signal_system.h
 include/sigc++-1.0/sigc++/slot.h
 include/sigc++-1.0/sigc++/thread.h
 include/sigc++-1.0/sigc++/type.h
 include/sigc++-1.0/sigc++config.h
 lib/libsigc.a
 lib/libsigc.so
 lib/libsigc.so.1
 share/aclocal/sigc++.m4
-%%PORTDOCS%%share/doc/libsigc++/API
-%%PORTDOCS%%share/doc/libsigc++/FAQ
-%%PORTDOCS%%share/doc/libsigc++/FEATURES
-%%PORTDOCS%%share/doc/libsigc++/README
-%%PORTDOCS%%share/doc/libsigc++/UML
-%%PORTDOCS%%share/doc/libsigc++/conventions
-%%PORTDOCS%%share/doc/libsigc++/diagrams
-%%PORTDOCS%%share/doc/libsigc++/marshal
-%%PORTDOCS%%share/doc/libsigc++/powerusers
-%%PORTDOCS%%share/doc/libsigc++/requirements
-%%PORTDOCS%%share/doc/libsigc++/riscos
-%%PORTDOCS%%share/doc/libsigc++/signals
-%%PORTDOCS%%share/doc/libsigc++/win32
+%%PORTDOCS%%%%DOCSDIR%%/API
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/UML
+%%PORTDOCS%%%%DOCSDIR%%/conventions
+%%PORTDOCS%%%%DOCSDIR%%/diagrams
+%%PORTDOCS%%%%DOCSDIR%%/marshal
+%%PORTDOCS%%%%DOCSDIR%%/powerusers
+%%PORTDOCS%%%%DOCSDIR%%/requirements
+%%PORTDOCS%%%%DOCSDIR%%/riscos
+%%PORTDOCS%%%%DOCSDIR%%/signals
+%%PORTDOCS%%%%DOCSDIR%%/win32
 share/sigc++-1.0/sigc++/macros/basic_signal.h.m4
 share/sigc++-1.0/sigc++/macros/bind.h.m4
 share/sigc++-1.0/sigc++/macros/class_slot.h.m4
 share/sigc++-1.0/sigc++/macros/convert.h.m4
 share/sigc++-1.0/sigc++/macros/func_slot.h.m4
 share/sigc++-1.0/sigc++/macros/object_slot.h.m4
 share/sigc++-1.0/sigc++/macros/retbind.h.m4
 share/sigc++-1.0/sigc++/macros/rettype.h.m4
 share/sigc++-1.0/sigc++/macros/slot.h.m4
 share/sigc++-1.0/sigc++/macros/template.macros.m4
 @dirrm include/sigc++-1.0/sigc++
 @dirrm include/sigc++-1.0
-%%PORTDOCS%%@dirrm share/doc/libsigc++
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/sigc++-1.0/sigc++/macros
 @dirrm share/sigc++-1.0/sigc++
 @dirrm share/sigc++-1.0