2 files changed, 11 insertions, 20 deletions

diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index 9568734ffc97..5d0d56e256c2 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	equinox
 PORTVERSION=	1.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://gnome-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	gtk-
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-t
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 \
 		${LOCALBASE}/share/icons/Faenza/index.theme:${PORTSDIR}/x11-themes/gnome-icons-faenza
 
-USES=		pkgconfig
+USES=		pkgconfig libtool
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/equinox-${PORTVERSION}
@@ -35,14 +35,10 @@ EXAMPLES=	"Equinox Evolution.crx" "Equinox Evolution Dawn.crx" \
 OPTIONS_DEFINE=	ANIMATION EXAMPLES DOCS
 OPTIONS_DEFAULT=	ANIMATION
 ANIMATION_DESC=	Enable animation support
+ANIMATION_CONFIGURE_ENABLE=	animation
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MANIMATION}
-CONFIGURE_ARGS+=	--enable-animation
-.endif
-
 post-patch:
 	@${FIND} ${WRKDIR} -name 'gtkrc' -exec \
 	    ${REINPLACE_CMD} -e 's!^include "apps/nautilus\.rc"!#&!' {} +
@@ -51,21 +47,21 @@ post-patch:
 		${WRKSRC}/src/animation.c
 
 post-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in ${SUBDIRS}
-	${CP} -R ${WRKDIR}/${i} ${DATADIR}
-	${FIND} ${DATADIR}/${i} -type d -exec ${CHMOD} 755 {} +
-	${FIND} ${DATADIR}/${i} -type f -exec ${CHMOD} ${SHAREMODE} {} +
+	${CP} -R ${WRKDIR}/${i} ${STAGEDIR}${DATADIR}
+	${FIND} ${STAGEDIR}${DATADIR}/${i} -type d -exec ${CHMOD} 755 {} +
+	${FIND} ${STAGEDIR}${DATADIR}/${i} -type f -exec ${CHMOD} ${SHAREMODE} {} +
 .endfor
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKDIR}/$i ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/$i ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-equinox-engine/pkg-plist b/x11-themes/gtk-equinox-engine/pkg-plist
index e5b357a86d7a..f276c5283dc3 100644
--- a/x11-themes/gtk-equinox-engine/pkg-plist
+++ b/x11-themes/gtk-equinox-engine/pkg-plist
@@ -1,4 +1,3 @@
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libequinox.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libequinox.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Equinox Evolution.crx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Equinox Evolution Dawn.crx
@@ -239,10 +238,6 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libequinox.so
 @dirrm %%DATADIR%%/Equinox Evolution/gtk-2.0/apps
 @dirrm %%DATADIR%%/Equinox Evolution/gtk-2.0
 @dirrm %%DATADIR%%/Equinox Evolution
-@dirrmtry %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
-@dirrmtry lib/gtk-2.0