--- branches/magellan-next/include/xfce.sminc	2011/09/29 19:12:39	9012
+++ branches/magellan-next/include/xfce.sminc	2012/01/13 19:22:05	9863
@@ -1,6 +1,6 @@
 # $Id$
 
-: ${PCATEGORIE="xfce-base"}
+: ${PCAT="xfce-base"}
 : ${HOMEPAGE="http://www.xfce.org/"}
 
 : ${SRCFILE="${PNAME}-${PVER}.tar.bz2"}
@@ -16,14 +16,16 @@
 case ${PNAME} in
 	thunar-*-plugin)	URISUBDIR="thunar-plugins" ;;
 	xfce4-*-plugin)	URISUBDIR="panel-plugins" ;;
-	*)				URISUBDIR="xfce" ;;
+	parole|orage|ristretto|xfburn)	URISUBDIR="apps" ;;
+	xfce4-dict|xfce4-mixer|xfce4-notifyd|xfce4-taskmanager|xfce4-screenshooter)	URISUBDIR="apps" ;;
+	*)	URISUBDIR="xfce" ;;
 esac
 
 # default SRC_URIs
 SRC_URI=(
 	${SRC_URI[*]}
-	http://mocha.xfce.org/archive/src/${URISUBDIR}/${PNAME}/${PVER%.*}/${SRCFILE}
-	http://archive.xfce.org/src/${URISUBDIR}/${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}
 )