diff --git a/x11-themes/gtk-aurora-engine/Makefile b/x11-themes/gtk-aurora-engine/Makefile
index f345bfefe807..83f92ce3ace6 100644
--- a/x11-themes/gtk-aurora-engine/Makefile
+++ b/x11-themes/gtk-aurora-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aurora
 PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://gnome-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	gtk-
@@ -16,46 +16,22 @@ COMMENT=	Aurora GTK+ 2.x engine and "Aurora" theme
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/aurora-1.5
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKDIR}
-	@cd ${WRKDIR} && ${TAR} jxf ${DISTFILES} && ${RM} -f ${DISTFILES}
-	@cd ${WRKDIR} && ${TAR} zxf aurora-gtk-engine-1.5.tar.gz && ${RM} -f aurora-gtk-engine-1.5.tar.gz
-	@cd ${WRKDIR} && ${TAR} jxf Aurora.tar.bz2 && ${RM} -f Aurora.tar.bz2
+post-extract:
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		aurora-gtk-engine-1.5.tar.gz ${EXTRACT_AFTER_ARGS})
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		Aurora.tar.bz2 ${EXTRACT_AFTER_ARGS})
+	@${RM} ${WRKDIR}/Aurora/metacity-1/metacity-theme-2.xml~
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
-	${INSTALL_DATA} ${WRKSRC}/libaurora.la ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
-	${INSTALL_DATA} ${WRKSRC}/.libs/libaurora.so ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/Aurora/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/Aurora/gtk-2.0/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/gtk-2.0/gtkrc ${STAGEDIR}${PREFIX}/share/themes/Aurora/gtk-2.0/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/close.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/close_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/close_prelight_glow.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/close_small.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/close_small_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/maximize.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/maximize_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/menu.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/menu_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/menu_small.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/menu_small_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/metacity-theme-1.xml ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/metacity-theme-2.xml ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/minimize.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/minimize_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/restore.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
-	${INSTALL_DATA} ${WRKDIR}/Aurora/metacity-1/restore_prelight.png ${STAGEDIR}${PREFIX}/share/themes/Aurora/metacity-1/
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/themes
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} Aurora \
+		${STAGEDIR}${PREFIX}/share/themes)
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-aurora-engine/pkg-plist b/x11-themes/gtk-aurora-engine/pkg-plist
index 9bebca343e92..87e432aab56c 100644
--- a/x11-themes/gtk-aurora-engine/pkg-plist
+++ b/x11-themes/gtk-aurora-engine/pkg-plist
@@ -1,4 +1,3 @@
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libaurora.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libaurora.so
 share/themes/Aurora/gtk-2.0/gtkrc
 share/themes/Aurora/metacity-1/close.png
@@ -21,7 +20,3 @@ share/themes/Aurora/metacity-1/restore_prelight.png
 @dirrm share/themes/Aurora/gtk-2.0
 @dirrm share/themes/Aurora/metacity-1
 @dirrm share/themes/Aurora
-@dirrm share/themes
-@dirrm lib/gtk-2.0/%%GTK2_VERSION%%/engines
-@dirrm lib/gtk-2.0/%%GTK2_VERSION%%
-@dirrm lib/gtk-2.0