4 files changed, 43 insertions, 52 deletions

diff --git a/x11-wm/mosfet-liquid/Makefile b/x11-wm/mosfet-liquid/Makefile
index 15e8d47abb8b..0985fc795aee 100644
--- a/x11-wm/mosfet-liquid/Makefile
+++ b/x11-wm/mosfet-liquid/Makefile
@@ -6,23 +6,32 @@
 #
 
 PORTNAME=	mosfet-liquid
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	http://www.mosfet.org/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	michiel.dewilde@rug.ac.be
+MAINTAINER=	ports@geeksrus.net
 
 BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
 		autoconf213:${PORTSDIR}/devel/autoconf213
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_KDEBASE_VER=2
+USE_KDEBASE_VER=3
 INSTALLS_SHLIB=	yes
 
+MAKE_ENV+=	PATH=${WRKDIR}/bin:${PATH}
+CONFIGURE_ENV+=	PATH=${WRKDIR}/bin:${PATH}
+
+pre-everything::
+	${MKDIR} ${WRKDIR}/bin
+	-$(LN) -sf ${LOCALBASE}/bin/aclocal14 ${WRKDIR}/bin/aclocal
+	-$(LN) -sf ${LOCALBASE}/bin/autoconf213  ${WRKDIR}/bin/autoconf
+	-$(LN) -sf ${LOCALBASE}/bin/autoheader213  ${WRKDIR}/bin/autoheader
+	-$(LN) -sf ${LOCALBASE}/bin/automake14  ${WRKDIR}/bin/automake
+
 pre-configure:
-	cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} -f Makefile.cvs
 
 .include <bsd.port.mk>
diff --git a/x11-wm/mosfet-liquid/distinfo b/x11-wm/mosfet-liquid/distinfo
index 113e7e38c7b5..706e8beaaa6b 100644
--- a/x11-wm/mosfet-liquid/distinfo
+++ b/x11-wm/mosfet-liquid/distinfo
@@ -1 +1 @@
-MD5 (mosfet-liquid0.7.tar.gz) = b7211795f3f8165734a894cc125e386b
+MD5 (mosfet-liquid0.9.4.tar.gz) = 167af64ae4dee352b7014e4c3ef7b649
diff --git a/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common b/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common
deleted file mode 100644
index 55c5a99e68ee..000000000000
--- a/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common
+++ /dev/null
@@ -1,38 +0,0 @@
---- admin/Makefile.common.orig	Fri Jun 15 05:54:12 2001
-+++ admin/Makefile.common	Wed Jan  2 09:41:45 2002
-@@ -13,15 +13,15 @@
- 	  $(MAKE) -f Makefile.am top_srcdir=. configure.in ;\
- 	fi
- 	@echo "*** Retrieving configure tests needed by configure.in"
--	@aclocal
-+	@aclocal14
- 	@echo "*** Scanning for include statements"
--	@autoheader
-+	@autoheader213
- 	@echo "*** Building Makefile templates"
--	@automake
-+	@automake14
- 	@echo "*** Scanning for moc files and kde tags"
- 	@perl admin/am_edit
- 	@echo "*** Building configure"
--	@autoconf
-+	@autoconf213
- 	@if test -r configure.in.in ; then \
- 	  perl -pi -e 'print "if test \"x\$$with_fast_perl\" = \"xyes\" ;\
- 	  then\n  perl -i.bak \$$ac_aux_dir/conf.change.pl \$$CONFIG_STATUS\
-@@ -48,11 +48,11 @@
- 	@if test -r configure.in.in; then \
- 	  $(MAKE) -f Makefile.am top_srcdir=. subdirs configure.in; \
- 	fi ;\
--	aclocal; \
--	autoheader; \
--	automake --foreign --include-deps; \
-+	aclocal14; \
-+	autoheader213; \
-+	automake14 --foreign --include-deps; \
- 	perl admin/am_edit; \
--	autoconf; \
-+	autoconf213; \
- 	if test -r configure.in.in ; then \
- 	  perl -pi -e 'print "if test \"x\$$with_fast_perl\" = \"xyes\" ;\
- 	  then\n  perl -i.bak \$$ac_aux_dir/conf.change.pl \$$CONFIG_STATUS\
diff --git a/x11-wm/mosfet-liquid/pkg-plist b/x11-wm/mosfet-liquid/pkg-plist
index 99b322de3bbe..514099123c39 100644
--- a/x11-wm/mosfet-liquid/pkg-plist
+++ b/x11-wm/mosfet-liquid/pkg-plist
@@ -1,15 +1,35 @@
-lib/kde2/libkwinliquid.la
-lib/kde2/libkwinliquid.so
-lib/libkcm_transmenu.la
-lib/libkcm_transmenu.so
-lib/liquid.la
-lib/liquid.so
-share/applnk/Settings/LookNFeel/transmenu.desktop
+lib/kde3/libkwinliquid.la
+lib/kde3/libkwinliquid.so
+lib/kde3/libkwinliquidmack.la
+lib/kde3/libkwinliquidmack.so
+lib/kde3/libkwinliquidold.la
+lib/kde3/libkwinliquidold.so
+lib/kde3/plugins/styles/liquid.la
+lib/kde3/plugins/styles/liquid.so
+lib/libkcm_liquid.la
+lib/libkcm_liquid.so
+share/applnk/Settings/LookNFeel/liquid.desktop
 share/apps/kdisplay/color-schemes/Liquid.kcsrc
+share/apps/ksplash/pics/splash_active_bar.png
+share/apps/ksplash/pics/splash_bottom.png
+share/apps/ksplash/pics/splash_inactive_bar.png
+share/apps/ksplash/pics/splash_top.png
 share/apps/kstyle/themes/liquid.themerc
 share/apps/kwin/liquid.desktop
+share/apps/kwin/liquidmack.desktop
+share/apps/kwin/liquidold.desktop
+@comment dirs
 @unexec rmdir %D/share/apps/kwin 2>/dev/null || true
 @unexec rmdir %D/share/apps/kstyle/themes 2>/dev/null || true
+@unexec rmdir %D/share/apps/kstyle 2>/dev/null || true
+@unexec rmdir %D/share/apps/ksplash/pics 2>/dev/null || true
+@unexec rmdir %D/share/apps/ksplash 2>/dev/null || true
 @unexec rmdir %D/share/apps/kdisplay/color-schemes 2>/dev/null || true
+@unexec rmdir %D/share/apps/kdisplay 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Settings/LookNFeel 2>/dev/null || true
-@unexec rmdir %D/lib/kde2  2>/dev/null || true
+@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/lib/kde3/plugins/styles 2>/dev/null || true
+@unexec rmdir %D/lib/kde3/plugins 2>/dev/null || true
+@unexec rmdir %D/lib/kde3 2>/dev/null || true