pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/elementary Fix hardcoded aclocal-1.13/automake-1.1...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b39377dc9e52
branches:  trunk
changeset: 621234:b39377dc9e52
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jul 06 10:50:32 2013 +0000

description:
Fix hardcoded aclocal-1.13/automake-1.13 issue. PR 48020.
While here, add desktop-file-utils/desktopdb.mk and bump PKGREVISION.

diffstat:

 x11/elementary/Makefile |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r d5f04fff270e -r b39377dc9e52 x11/elementary/Makefile
--- a/x11/elementary/Makefile   Sat Jul 06 10:42:28 2013 +0000
+++ b/x11/elementary/Makefile   Sat Jul 06 10:50:32 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/06/23 18:50:08 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.3 2013/07/06 10:50:32 wiz Exp $
 
 DISTNAME=      elementary-1.7.7
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  http://download.enlightenment.org/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +18,10 @@
 USE_TOOLS+=    pkg-config
 USE_TOOLS+=    autoconf automake # because I patched configure.ac
 USE_TOOLS+=    gmake
+# override for hardcoded aclocal-1.13 in configure script
+CONFIGURE_ENV+=        ACLOCAL='aclocal'
+# override for hardcoded automake-1.13 in Makefiles
+MAKEFLAGS+=    AUTOMAKE="automake -af"
 
 PKGCONFIG_OVERRIDE=    elementary
 
@@ -37,6 +41,7 @@
 .include "../../graphics/evas-jpeg/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"
 .include "../../devel/eio/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 #.include "../../devel/ewheather/buildlink3.mk"
 #.include "../../devel/emap/buildlink3.mk"
 #.include "../../devel/ethumb/buildlink3.mk"



Home | Main Index | Thread Index | Old Index