--- trunk/core/include/xfce.sminc	2010/08/07 12:43:36	5721
+++ trunk/include/xfce.sminc	2013/01/28 08:55:49	16170
@@ -1,6 +1,6 @@
 # $Id$
 
-: ${PCATEGORIE="xfce-base"}
+: ${PCAT="xfce-base"}
 : ${HOMEPAGE="http://www.xfce.org/"}
 
 : ${SRCFILE="${PNAME}-${PVER}.tar.bz2"}
@@ -13,10 +13,19 @@
 
 sminclude mtools
 
+case ${PNAME} in
+	thunar-*-plugin)	URISUBDIR="thunar-plugins" ;;
+	xfce4-*-plugin)	URISUBDIR="panel-plugins" ;;
+	parole|orage|ristretto|xfburn)	URISUBDIR="apps" ;;
+	xfce4-dict|xfce4-mixer|xfce4-notifyd|xfce4-taskmanager|xfce4-screenshooter|xfce4-terminal)	URISUBDIR="apps" ;;
+	*)	URISUBDIR="xfce" ;;
+esac
+
 # default SRC_URIs
 SRC_URI=(
 	${SRC_URI[*]}
-	http://mocha.xfce.org/archive/src/xfce/${PNAME}/${PVER%.*}/${SRCFILE}
+	http://mocha.xfce.org/archive/src/${URISUBDIR}/${PNAME}/$(echo ${PVER} | cut -d. -f1-2)/${SRCFILE}
+	http://archive.xfce.org/src/${URISUBDIR}/${PNAME}/$(echo ${PVER} | cut -d. -f1-2)/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 )
 
@@ -26,7 +35,13 @@
 xfce_configure()
 {
 	local configure_opts="$@"
-	mconfigure ${configure_opts} || die
+	mconfigure \
+		--libexecdir=/usr/$(mlibdir)/${PNAME} \
+		--with-html-dir=/usr/share/doc/${PNAME}-${PVER}/html \
+		--disable-debug \
+		--disable-static \
+		${configure_opts} \
+		|| die
 }
 
 xfce_src_prepare()
@@ -38,13 +53,7 @@
 {
 	cd ${SRCDIR}
 
-	xfce_configure \
-		--libexecdir=/usr/$(mlibdir)/${PNAME} \
-		--with-html-dir=/usr/share/doc/${PNAME}-${PVER}/html \
-		--disable-debug \
-		--disable-static \
-		|| die
-
+	xfce_configure || die
 	mmake ${XFCE_MAKE_OPTS} || die
 }