diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2010-10-05 19:57:56 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2010-10-05 19:57:56 +0000 |
| commit | 7e80cde3289d108a73c54656f4fde354dd2fb09e (patch) | |
| tree | b85b705571d426ca1d0ff74b6af8f029081a6a39 /deskutils | |
| parent | - update to 3.43 (diff) | |
Round one migration of ports from automake{19,110} to automake111
Notes
Notes:
svn path=/head/; revision=262460
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/drivel/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/global-menu/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/google-gadgets/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/ksmoothdock/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/ksmoothdock/files/patch-admin__cvs.sh | 7 | ||||
| -rw-r--r-- | deskutils/multisync/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/taskjuggler/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/taskjuggler/files/patch-admin_cvs.sh | 7 |
8 files changed, 20 insertions, 6 deletions
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile index 4e78a9e03f7e..71fccf898080 100644 --- a/deskutils/drivel/Makefile +++ b/deskutils/drivel/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_OMF= yes -USE_AUTOTOOLS= libtool:22 autoconf:267:env automake:110:env +USE_AUTOTOOLS= libtool:22 autoconf:267:env automake:111:env CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile index 59ed954141c5..4dde66286d2e 100644 --- a/deskutils/global-menu/Makefile +++ b/deskutils/global-menu/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:22 automake:19:env autoheader:267:env +USE_AUTOTOOLS= libtool:22 automake:111:env autoheader:267:env INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile index ac4afb6b74e5..e59d421d4eaf 100644 --- a/deskutils/google-gadgets/Makefile +++ b/deskutils/google-gadgets/Makefile @@ -38,7 +38,7 @@ USE_GSTREAMER= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins -USE_AUTOTOOLS= libtool:22:env autoconf:267:env automake:110:env aclocal:110:env libltdl:22 +USE_AUTOTOOLS= libtool:22:env autoconf:267:env automake:111:env aclocal:111:env libltdl:22 WANT_GNOME= yes USE_GNOME= gnomehack INSTALLS_ICONS= yes diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile index 3e2b9213993a..420fcdbdd5b8 100644 --- a/deskutils/ksmoothdock/Makefile +++ b/deskutils/ksmoothdock/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22 +USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_PERL5_BUILD=yes diff --git a/deskutils/ksmoothdock/files/patch-admin__cvs.sh b/deskutils/ksmoothdock/files/patch-admin__cvs.sh new file mode 100644 index 000000000000..8b25d1c032d0 --- /dev/null +++ b/deskutils/ksmoothdock/files/patch-admin__cvs.sh @@ -0,0 +1,7 @@ +--- admin/cvs.sh.orig 2007-04-16 18:39:49.000000000 -0500 ++++ admin/cvs.sh 2010-10-02 14:07:16.000000000 -0500 +@@ -70,3 +70,3 @@ + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) + echo "*** $AUTOMAKE_STRING found." diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile index ce6f47fb18d4..084a23c99488 100644 --- a/deskutils/multisync/Makefile +++ b/deskutils/multisync/Makefile @@ -19,7 +19,7 @@ WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION} USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix libgnomeui USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env libtool:22 +USE_AUTOTOOLS= automake:111:env libtool:22 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" MAKE_JOBS_UNSAFE= yes diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index b3ae8b455eca..bd77245064bd 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -29,7 +29,7 @@ USE_BZIP2= yes USE_QT_VER= 3 USE_PERL5_RUN= yes USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22 +USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" diff --git a/deskutils/taskjuggler/files/patch-admin_cvs.sh b/deskutils/taskjuggler/files/patch-admin_cvs.sh new file mode 100644 index 000000000000..f8a852bbab64 --- /dev/null +++ b/deskutils/taskjuggler/files/patch-admin_cvs.sh @@ -0,0 +1,7 @@ +--- admin/cvs.sh.orig 2009-07-15 03:33:20.000000000 -0500 ++++ admin/cvs.sh 2010-10-02 14:13:26.000000000 -0500 +@@ -70,3 +70,3 @@ + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) : ;; ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;; + "" ) |