4 files changed, 16 insertions, 32 deletions

diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile
index af719ef0b3cd..9e9a943c7fcd 100644
--- a/x11-themes/gtk-cleanice-engine/Makefile
+++ b/x11-themes/gtk-cleanice-engine/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	gtk-cleanice-engine
-PORTVERSION=	2.4.0
-PORTREVISION=	5
+PORTVERSION=	2.4.1
 CATEGORIES=	x11-themes gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	elysium-project
+MASTER_SITES=	SF/elysium-project
 DISTNAME=	gtk-engines-cleanice-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.gz \
 		${THEME}.tar.gz
@@ -18,29 +16,24 @@ DISTFILES=	${DISTNAME}.tar.gz \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simplistic GTK+ 2.x theme engine
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gnomehack gnometarget gtk20
+USE_AUTOTOOLS=	libtool:15
 
 THEME=		cleanice-theme-1.2.7
 THEMEDIR=	${WRKDIR}/${THEME}/Theme
 
 post-install:
-	${MKDIR} ${PREFIX}/share/themes/CleanIce/gtk-2.0
-	${MKDIR} ${PREFIX}/share/themes/CleanIce/metacity-1
-	${MKDIR} ${PREFIX}/share/themes/CleanIce-Dark/gtk-2.0
+	@${MKDIR} ${PREFIX}/share/themes/CleanIce
 	${INSTALL_DATA} ${THEMEDIR}/cleanice/index.theme \
 		${PREFIX}/share/themes/CleanIce
+	@${MKDIR} ${PREFIX}/share/themes/CleanIce/gtk-2.0
 	${INSTALL_DATA} ${THEMEDIR}/cleanice/gtkrc \
 		${PREFIX}/share/themes/CleanIce/gtk-2.0
+	@${MKDIR} ${PREFIX}/share/themes/CleanIce/metacity-1
 	${INSTALL_DATA} ${THEMEDIR}/cleanice/metacity-theme-1.xml \
 		${PREFIX}/share/themes/CleanIce/metacity-1
+	@${MKDIR} ${PREFIX}/share/themes/CleanIce-Dark/gtk-2.0
 	${INSTALL_DATA} ${THEMEDIR}/cleanice-dark/gtkrc \
 		${PREFIX}/share/themes/CleanIce-Dark/gtk-2.0
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700029
-BROKEN=		Incorrect objformat handling
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/gtk-cleanice-engine/distinfo b/x11-themes/gtk-cleanice-engine/distinfo
index 2c216fc62d82..3f5845dc0ff9 100644
--- a/x11-themes/gtk-cleanice-engine/distinfo
+++ b/x11-themes/gtk-cleanice-engine/distinfo
@@ -1,6 +1,6 @@
-MD5 (gtk-engines-cleanice-2.4.0.tar.gz) = 0737454f3209e0d418f210b22440383a
-SHA256 (gtk-engines-cleanice-2.4.0.tar.gz) = 47955f40c93cb1c4ed4f455efd7cab14bc9e18a146abbc90f761692bff19f819
-SIZE (gtk-engines-cleanice-2.4.0.tar.gz) = 210165
+MD5 (gtk-engines-cleanice-2.4.1.tar.gz) = bc9d3eb31671f6918666d0a58f64d1ae
+SHA256 (gtk-engines-cleanice-2.4.1.tar.gz) = f927f7b06b979ced52cc11e3febecffc3f1aaca07a78c9d0aada31f25c48fb0d
+SIZE (gtk-engines-cleanice-2.4.1.tar.gz) = 329188
 MD5 (cleanice-theme-1.2.7.tar.gz) = bf12a530211c664e6e9cbdbd863ac6a3
 SHA256 (cleanice-theme-1.2.7.tar.gz) = 0be0da024d53acbc3ad0a5a7276e049b27432e75ba527cc17576a2f77685509e
 SIZE (cleanice-theme-1.2.7.tar.gz) = 237813
diff --git a/x11-themes/gtk-cleanice-engine/files/patch-configure b/x11-themes/gtk-cleanice-engine/files/patch-configure
deleted file mode 100644
index f7c33918c8ed..000000000000
--- a/x11-themes/gtk-cleanice-engine/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Thu Mar 13 22:30:06 2003
-+++ configure	Thu Mar 13 22:30:54 2003
-@@ -7830,6 +7830,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-themes/gtk-cleanice-engine/pkg-plist b/x11-themes/gtk-cleanice-engine/pkg-plist
index 8760dfd67fbe..683d61146606 100644
--- a/x11-themes/gtk-cleanice-engine/pkg-plist
+++ b/x11-themes/gtk-cleanice-engine/pkg-plist
@@ -1,11 +1,12 @@
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcleanice.a
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcleanice.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcleanice.so
 share/themes/CleanIce/index.theme
 share/themes/CleanIce/gtk-2.0/gtkrc
 share/themes/CleanIce/metacity-1/metacity-theme-1.xml
 share/themes/CleanIce-Dark/gtk-2.0/gtkrc
-@dirrm share/themes/CleanIce/gtk-2.0
-@dirrm share/themes/CleanIce/metacity-1
-@dirrm share/themes/CleanIce
 @dirrm share/themes/CleanIce-Dark/gtk-2.0
 @dirrm share/themes/CleanIce-Dark
+@dirrm share/themes/CleanIce/metacity-1
+@dirrm share/themes/CleanIce/gtk-2.0
+@dirrm share/themes/CleanIce