--- trunk/core/include/xfce.sminc	2010/08/07 11:59:27	5709
+++ trunk/include/xfce.sminc	2013/01/28 09:10:20	16173
@@ -1,6 +1,6 @@
 # $Id$
 
-: ${PCATEGORIE="xfce-base"}
+: ${PCAT="xfce-base"}
 : ${HOMEPAGE="http://www.xfce.org/"}
 
 : ${SRCFILE="${PNAME}-${PVER}.tar.bz2"}
@@ -13,20 +13,35 @@
 
 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}
 )
 
 # special functions needed by postinstall|postremove
-SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} xfce_update_desktop_db xfce_update_mime_db xfce_update_icon_cache"
+SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} xfce_update_desktop_db xfce_update_mime_db xfce_update_icon_cache xfce_postinstall xfce_postremove"
 
 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()
@@ -37,10 +52,17 @@
 xfce_src_compile()
 {
 	cd ${SRCDIR}
-	xfce_configure --disable-debug --disable-static || die
+
+	xfce_configure || die
 	mmake ${XFCE_MAKE_OPTS} || die
 }
 
+xfce_src_check()
+{
+	cd ${SRCDIR}
+	mmake -k check || die
+}
+
 xfce_src_install()
 {
 	cd ${SRCDIR}
@@ -114,4 +136,4 @@
 	xfce_update_icon_cache
 }
 
-export_inherits xfce src_prepare src_compile src_install postinstall postremove
+export_inherits xfce src_prepare src_compile src_check src_install postinstall postremove