--- trunk/extras/cyrus-sasl/cyrus-sasl-2.1.27-r1.smage2	2018/12/06 10:02:58	31712
+++ trunk/extras/cyrus-sasl/cyrus-sasl-2.1.27-r1.smage2	2018/12/06 10:31:46	31713
@@ -26,18 +26,18 @@
 SRC_URI=(
 	ftp://ftp.cyrusimap.org/${PNAME}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
+	mirror://${PNAME}/${PNAME}-2.1.25-no_rpath.patch || die
 )
 
-UP2DATE="updatecmd ftp://ftp.cyrusimap.org/${PNAME}/ | grep ${PNAME}- | grep -v rc | lasttarball gz"
+UP2DATE="updatecmd ftp://ftp.cyrusimap.org/${PNAME}/ | grep ${PNAME}- | grep -v rc | highesttarball gz"
 
 src_prepare()
 {
 	munpack ${SRCFILE}
 	cd ${SRCDIR}
 
-	# use newer macro names
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
-	sed -i 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.in saslauthd/configure.in || die
+	# no rpath
+	mpatch ${PNAME}-2.1.25-no_rpath.patch || die
 
 	# upstream doesn't even honor their own configure options...
 	sed -i 's:^sasldir = .*$:sasldir = $(plugindir):' ${SRCDIR}/plugins/Makefile.{am,in} || die
@@ -51,7 +51,7 @@
 	mlibtoolize || die
 	popd
 	# use full pathes or automake fails in subdirs
-	mautoreconf -I $(pwd)/cmulocal -I config || die
+	mautoreconf -I config || die
 }
 
 src_compile()