Index: Makefile
===================================================================
--- Makefile	(revision 342690)
+++ Makefile	(working copy)
@@ -10,7 +10,6 @@
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Extension library for Qt
 
-LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/avahi-libdns
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_BDB=	44+
@@ -21,14 +20,15 @@
 
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-prefix ${STAGEDIR}${PREFIX} \
-		-libdir ${STAGEDIR}${PREFIX}/lib/qxt \
+CONFIGURE_ARGS=	-prefix ${PREFIX} \
+		-libdir ${PREFIX}/lib/qxt \
 		-qmake-bin ${QMAKE} \
-		-featuredir ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features \
+		-featuredir ${PREFIX}/${QT_MKSPECDIR_REL}/features \
 		-I ${BDB_INCLUDE_DIR} \
 		-I ${LOCALBASE}/include/avahi-compat-libdns_sd \
 		-L ${BDB_LIB_DIR} \
 		-verbose
+DESTDIRNAME=	INSTALL_ROOT
 
 COMMIT=		dadc327c2a6a
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${COMMIT}
@@ -37,13 +37,22 @@
     		SHVER_2=${PORTVERSION:R} \
 		SHVER_3=${PORTVERSION:R:R}
 
+OPTIONS_DEFAULT=	AVAHI
+OPTIONS_SINGLE=		ZEROCONF
+OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
+AVAHI_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+
+STRIP_FILES=	lib/qxt/lib*.so.${PORTVERSION} \
+		${QT_PLUGINDIR_REL}/designer/libQxtDesignerPlugins.so
+
 post-patch:
 	${REINPLACE_CMD} -e '\
-	    s|%%PREFIX%%|${PREFIX}|g; \
-	    s|%%STAGEDIR%%|${STAGEDIR}|g; \
 	    s|/bin/bash|${LOCALBASE}/bin/bash|g; \
 	    /^QXT_MODULES/s|docs||g' \
-	    ${WRKSRC}/configure \
+	    ${WRKSRC}/configure
+	${REINPLACE_CMD} -e \
+	    's,$$$$\[QT_INSTALL_PLUGINS\],${PREFIX}/${QT_PLUGINDIR_REL},' \
 	    ${WRKSRC}/src/designer/designer.pro
 	${REINPLACE_CMD} -e '\
 	    s|ldb|l${BDB_LIB_NAME} -L${BDB_LIB_DIR}|g; \
@@ -50,13 +59,12 @@
 	    /INCLUDEPATH/s|\.|${BDB_INCLUDE_DIR}|g' \
 	    ${WRKSRC}/config.tests/db/db.pro
 
-post-configure:
-	${REINPLACE_CMD} -e 's|${STAGEDIR}||g' \
-	    ${WRKSRC}/features/qxtvars.prf
-
 regression-test:
 	cd ${WRKSRC}/tests && \
 	    ${QMAKE} tests.pro && ${MAKE} && \
 	    ${FIND} unit -type f -perm -0755 -exec {} \;
 
+post-install:
+	${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,}
+
 .include <bsd.port.mk>
Index: files/patch-src-designer_designer.pro
===================================================================
--- files/patch-src-designer_designer.pro	(revision 342690)
+++ files/patch-src-designer_designer.pro	(working copy)
@@ -1,9 +0,0 @@
---- src/designer/designer.pro.orig	2013-06-17 10:19:19.000000000 +0200
-+++ src/designer/designer.pro	2013-06-17 10:19:36.000000000 +0200
-@@ -8,5 +8,5 @@
- include(../qxtbase.pri)
- 
- CONFIG          += designer plugin
--target.path      = $$[QT_INSTALL_PLUGINS]/designer
-+target.path      = %%STAGEDIR%%%%PREFIX%%/lib/qt4/plugins/designer
- INSTALLS         = target
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 342690)
+++ pkg-plist	(working copy)
@@ -348,8 +348,8 @@
 lib/qxt/libQxtZeroconf.so.%%SHVER_1%%
 lib/qxt/libQxtZeroconf.so.%%SHVER_2%%
 lib/qxt/libQxtZeroconf.so.%%SHVER_3%%
-share/qt4/mkspecs/features/qxt.prf
-share/qt4/mkspecs/features/qxtvars.prf
+%%QT_MKSPECDIR%%/features/qxt.prf
+%%QT_MKSPECDIR%%/features/qxtvars.prf
 @dirrm include/QxtBerkeley
 @dirrm include/QxtCore
 @dirrm include/QxtGui
@@ -359,8 +359,8 @@
 @dirrm include/QxtWeb
 @dirrm lib/qxt
 @dirrmtry %%QT_PLUGINDIR%%/designer
-@dirrmtry share/qt4/mkspecs/features
-@dirrmtry share/qt4/mkspecs
+@dirrmtry %%QT_MKSPECDIR%%/features
+@dirrmtry %%QT_MKSPECDIR%%
 @dirrmtry share/qt4
 @dirrmtry %%QT_PLUGINDIR%%
 @dirrmtry %%QT_LIBDIR%%