Update to the autotools new world order.

Tested by:	numerous package build runs
Approved by:	portmgr
Thanks to:	des, kris, linimon, pav

4 files changed, 12 insertions, 15 deletions

diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 4bf8fa2918c9..0c1039af9ad7 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lesstif
 PORTVERSION=	0.95.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -73,12 +73,8 @@ pre-extract:
 .endif
 
 post-install:
-	${RM} -f ${PREFIX}/lib/libXm.la
-	${RM} -f ${PREFIX}/lib/libMrm.la
-	${RM} -f ${PREFIX}/lib/libDtPrint.la
-	${RM} -f ${PREFIX}/lib/libUil.la
-	${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \
-		${LOCALBASE}/share/aclocal
+	@${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \
+		${PREFIX}/share/aclocal
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist
index 26736104e573..3f49d7c75527 100644
--- a/x11-toolkits/lesstif/pkg-plist
+++ b/x11-toolkits/lesstif/pkg-plist
@@ -331,17 +331,22 @@ lib/X11/mwm/README
 lib/X11/mwm/alt.map
 lib/X11/mwm/system.mwmrc
 lib/libDtPrint.a
+lib/libDtPrint.la
 lib/libDtPrint.so
 lib/libDtPrint.so.1
 lib/libUil.a
+lib/libUil.la
 lib/libUil.so
 lib/libUil.so.2
 lib/libMrm.a
+lib/libMrm.la
 lib/libMrm.so
 lib/libMrm.so.2
 lib/libXm.a
+lib/libXm.la
 lib/libXm.so
 lib/libXm.so.2
+share/aclocal/ac_find_motif.m4
 @unexec rm -f %D/LessTif/doc/Lessdox
 @dirrm LessTif/doc/images
 @dirrm LessTif/doc/html
@@ -354,7 +359,3 @@ lib/libXm.so.2
 @dirrm lib/LessTif/config
 @dirrm lib/LessTif
 @dirrm lib/X11/mwm
-@cwd %%LOCALBASE%%
-share/aclocal/ac_find_motif.m4
-share/aclocal19/ac_find_motif.m4
-@dirrmtry share/aclocal19
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 14ac79ec00e0..ffe40e662c37 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -88,7 +88,7 @@ EXAMPLES=	combobutton.php fileselection.php gtk.php hello.php list.php \
 
 pre-configure:
 	@${ECHO_MSG} "===>  Building configuration files for ${PKGNAME}"
-	@(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=autoconf259 PHP_AUTOHEADER=autoheader259 ./buildconf)
+	@(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=${AUTOCONF} PHP_AUTOHEADER=${AUTOHEADER} ./buildconf)
 .for FILE in ${PIC2FIX}
 	@${REINPLACE_CMD} -e "s|-prefer-pic|${CFLAGS}|g" ${WRKSRC}/${FILE}
 .endfor
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 14ac79ec00e0..ffe40e662c37 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -88,7 +88,7 @@ EXAMPLES=	combobutton.php fileselection.php gtk.php hello.php list.php \
 
 pre-configure:
 	@${ECHO_MSG} "===>  Building configuration files for ${PKGNAME}"
-	@(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=autoconf259 PHP_AUTOHEADER=autoheader259 ./buildconf)
+	@(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=${AUTOCONF} PHP_AUTOHEADER=${AUTOHEADER} ./buildconf)
 .for FILE in ${PIC2FIX}
 	@${REINPLACE_CMD} -e "s|-prefer-pic|${CFLAGS}|g" ${WRKSRC}/${FILE}
 .endfor