diff options
-rw-r--r-- | audio/easytag-devel/files/patch-src-mp4_tag.c | 11 | ||||
-rw-r--r-- | audio/easytag/files/patch-src-mp4_tag.c | 11 | ||||
-rw-r--r-- | audio/libao/Makefile | 1 | ||||
-rw-r--r-- | databases/mysql-query-browser/Makefile | 40 | ||||
-rw-r--r-- | devel/distcc/Makefile | 7 | ||||
-rw-r--r-- | editors/mlview/Makefile | 4 | ||||
-rw-r--r-- | games/gno3dtet/Makefile | 4 | ||||
-rw-r--r-- | math/gretl/Makefile | 4 | ||||
-rw-r--r-- | net-p2p/xmule/Makefile | 6 | ||||
-rw-r--r-- | textproc/iiimf-gnome-im-switcher/Makefile | 4 | ||||
-rw-r--r-- | textproc/iiimf-gnome-im-switcher/files/patch-Makefile | 6 | ||||
-rw-r--r-- | x11/workrave/Makefile | 49 | ||||
-rw-r--r-- | x11/workrave/distinfo | 6 | ||||
-rw-r--r-- | x11/workrave/files/patch-frontend__common__src__System.cc | 10 | ||||
-rw-r--r-- | x11/workrave/pkg-plist | 45 |
15 files changed, 125 insertions, 83 deletions
diff --git a/audio/easytag-devel/files/patch-src-mp4_tag.c b/audio/easytag-devel/files/patch-src-mp4_tag.c new file mode 100644 index 000000000..d931833f2 --- /dev/null +++ b/audio/easytag-devel/files/patch-src-mp4_tag.c @@ -0,0 +1,11 @@ +--- src/mp4_tag.c.orig 2007-10-02 22:37:42.000000000 +0400 ++++ src/mp4_tag.c 2007-10-02 22:39:54.000000000 +0400 +@@ -185,7 +185,7 @@ + * Picture * + ***********/ + // There is only one picture! +- if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) ) ++ if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize, 0 ) ) + { + Picture *pic = Picture_Allocate(); + pic->size = coverSize; diff --git a/audio/easytag/files/patch-src-mp4_tag.c b/audio/easytag/files/patch-src-mp4_tag.c new file mode 100644 index 000000000..81fdaf300 --- /dev/null +++ b/audio/easytag/files/patch-src-mp4_tag.c @@ -0,0 +1,11 @@ +--- src/mp4_tag.c.orig 2007-10-02 22:05:09.000000000 +0400 ++++ src/mp4_tag.c 2007-10-02 22:05:22.000000000 +0400 +@@ -185,7 +185,7 @@ + * Picture * + ***********/ + // There is only one picture! +- if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) ) ++ if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize, 0 ) ) + { + Picture *pic = Picture_Allocate(); + pic->size = coverSize; diff --git a/audio/libao/Makefile b/audio/libao/Makefile index 46eb6d71f..afab0b60d 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -7,6 +7,7 @@ PORTNAME= libao PORTVERSION= 0.8.8 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/ao/ diff --git a/databases/mysql-query-browser/Makefile b/databases/mysql-query-browser/Makefile index 1db37488a..ddb77ae98 100644 --- a/databases/mysql-query-browser/Makefile +++ b/databases/mysql-query-browser/Makefile @@ -7,7 +7,7 @@ PORTNAME= mysql-query-browser PORTVERSION= 1.1.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQLAdministrationSuite @@ -15,31 +15,29 @@ MASTER_SITE_SUBDIR= MySQLAdministrationSuite MAINTAINER= ports@FreeBSD.org COMMENT= A database querying tool for MySQL servers -LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ +LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ pcre.0:${PORTSDIR}/devel/pcre \ rarian.0:${PORTSDIR}/textproc/rarian BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed \ - gtkdoc-mkhtml:${PORTSDIR}/textproc/gtk-doc + gtkdoc-mkhtml:${PORTSDIR}/textproc/gtk-doc \ -BROKEN= Does not compile - -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:259:env -CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ +USE_AUTOTOOLS= automake:19:env autoconf:261:env +CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" -GTKHTML_VER= ${gtkhtml3_DETECT:R} -CONFIGURE_ARGS_GUI+= --prefix=${X11BASE} \ - --datadir=${DATADIR} \ - --localstatedir=${PREFIX}/share -CONFIGURE_ARGS_MAIN+= ${CONFIGURE_ARGS_GUI} \ - --with-gtkhtml=${GTKHTML_VER:C/^.*\///g} USE_ICONV= yes -USE_GNOME= libglade2 gnomehack gtkhtml3 intltool +USE_GNOME= libglade2 gnomehack gtkhtml3 intltool libgnomeprint USE_MYSQL= yes DEFAULT_MYSQL_VER= 50 IGNORE_WITH_MYSQL= 323 -GNU_CONFIGURE= yes + +GTKHTML_VER= ${gtkhtml3_DETECT:R} +CONFIGURE_ARGS_GUI= --prefix=${X11BASE} \ + --datadir=${DATADIR} \ + --localstatedir=${PREFIX}/share +CONFIGURE_ARGS_MAIN= ${CONFIGURE_ARGS_GUI} \ + --with-gtkhtml=${GTKHTML_VER:C/^.*\///g} GUI_CONFIG_COOKIE= ${WRKDIR}/.gui_configure_done GUI_BUILD_COOKIE= ${WRKDIR}/.gui_build_done @@ -49,14 +47,6 @@ MAIN_BUILD_COOKIE= ${WRKDIR}/.main_build_done GUI_DIR= ${WRKSRC}/mysql-gui-common MAIN_DIR= ${WRKSRC}/mysql-query-browser -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= does not build on FreeBSD < 5.x -.endif - -ONLY_FOR_ARCHS= i386 - do-configure: @${DO_NADA} @@ -86,4 +76,4 @@ do-install: @cd ${MAIN_DIR}; \ ${GMAKE} ${INSTALL_TARGET} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index 8423d6607..584840797 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -3,11 +3,12 @@ # Whom: Frerich Raabe <frerich.raabe@gmx.de> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/devel/distcc/Makefile,v 1.1 2007/05/19 17:43:14 ahze Exp $ +# PORTNAME= distcc PORTVERSION= 2.18.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel ipv6 MASTER_SITES= http://distcc.samba.org/ftp/distcc/ PATCH_SITES= http://0pointer.de/public/ @@ -39,7 +40,7 @@ OPTIONS= AVAHI "Enable Avahi Zeroconf/mDNS/Bonjour support" Off \ PATCHFILES+= distcc-avahi.patch LIB_DEPENDS+= avahi-glib.1:${PORTSDIR}/net/avahi PATCH_DIST_STRIP= -p1 -USE_AUTOTOOLS+= autoconf:259 +USE_AUTOTOOLS+= autoconf:261 CFLAGS+= -DHAVE_AVAHI .endif diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index 40c5a906d..18a3f2aa8 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -7,7 +7,7 @@ PORTNAME= mlview PORTVERSION= 0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= A tree oriented XML editor for Gnome USE_BZIP2= yes USE_X_PREFIX= yes -USE_AUTOTOOLS= autoconf:259 libtool:15 +USE_AUTOTOOLS= autoconf:261 libtool:15 USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview USE_GMAKE= yes INSTALLS_SHLIB= yes diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile index f71d40dfd..6160023f4 100644 --- a/games/gno3dtet/Makefile +++ b/games/gno3dtet/Makefile @@ -7,7 +7,7 @@ PORTNAME= gno3dtet PORTVERSION= 1.96.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games gnome MASTER_SITES= http://eseb.net/ftp/gno3dtet/ EXTRACT_SUFX= .tgz @@ -20,7 +20,7 @@ EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2 USE_GMAKE= yes -USE_AUTOTOOLS= autoheader:259 automake:19 aclocal:19 autoconf:259 +USE_AUTOTOOLS= autoheader:261 automake:19 aclocal:19 autoconf:261 ACLOCAL_ARGS= -I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a -c -f CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/math/gretl/Makefile b/math/gretl/Makefile index cdace3ffb..c36ad83fc 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -8,7 +8,7 @@ PORTNAME= gretl PORTVERSION= 1.6.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math finance MASTER_SITES= SF @@ -25,7 +25,7 @@ WANT_GNOME= yes USE_GNOME= gnometarget gtk20 libxml2 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 autoconf:259 +USE_AUTOTOOLS= libtool:15 autoconf:261 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \ LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}" CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile index e4cc46459..c9daf955d 100644 --- a/net-p2p/xmule/Makefile +++ b/net-p2p/xmule/Makefile @@ -53,12 +53,12 @@ FILES_STDINT_PATCH= \ .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" +.if ${OSVERSION} >= 700042 +BROKEN= Does not compile with GCC 4.2 .endif .if ${ARCH} == "sparc64" -BROKEN= "Does not compile on sparc64" +BROKEN= Does not compile on sparc64 .endif post-patch: diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile index 91606443f..0a84acf37 100644 --- a/textproc/iiimf-gnome-im-switcher/Makefile +++ b/textproc/iiimf-gnome-im-switcher/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-im-switcher PORTVERSION= 12.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -26,7 +26,7 @@ USE_GNOME= intltool gconf2 libglade2 libgnomeui \ gnomepanel gnomeprefix gnomehack INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:261:env libtool:15:env GCONF_SCHEMAS= gnome-im-properties.schemas gnome-im-switcher.schemas diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile index da0154fa7..353b699ab 100644 --- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile +++ b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile @@ -10,8 +10,8 @@ +ACLOCAL = aclocal-1.9 +AUTOMAKE = automake-1.9 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy -+AUTOHEADER = autoheader-2.59 -+AUTOCONF = autoconf-2.59 ++AUTOHEADER = autoheader-2.61 ++AUTOCONF = autoconf-2.61 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf-2.59 ++AUTORECONF = autoreconf-2.61 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 0f0ce6e21..205ecb72b 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -6,41 +6,48 @@ # PORTNAME= workrave -PORTVERSION= 1.8.3 -PORTREVISION= 2 +PORTVERSION= 1.8.5 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= SF -MAINTAINER= infofarmer@FreeBSD.org +MAINTAINER= garga@FreeBSD.org COMMENT= A Gnome RSI prevention tool -.if !defined(WITHOUT_GNOME) -LIB_DEPENDS= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 -.else -LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 -.endif -.if !defined(WITHOUT_NETWORK) -LIB_DEPENDS+= gnet-2.0.0:${PORTSDIR}/net/gnet2 -.endif +OPTIONS= GNOME "Build with Gnome support" on \ + NETWORK "Build with network support" on USE_GMAKE= yes -USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool -.if !defined(WITHOUT_GNOME) -USE_GNOME+= gnomepanel -.endif USE_GCC= 3.4+ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-gconf -.if defined(WITHOUT_GNOME) -CONFIGURE_ARGS+=--disable-gnome -PLIST_SUB= GNOME="@comment " + +.include <bsd.port.pre.mk> + +.if defined(WITH_GNOME) +LIB_DEPENDS+= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 +USE_GNOME+= gnomepanel +PLIST_SUB+= GNOME="" .else -PLIST_SUB= GNOME="" +LIB_DEPENDS+= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +CONFIGURE_ARGS+=--disable-gnome +PLIST_SUB+= GNOME="@comment " .endif -.if defined(WITHOUT_NETWORK) + +.if defined(WITH_NETWORK) +LIB_DEPENDS+= gnet-2.0.0:${PORTSDIR}/net/gnet2 +.else CONFIGURE_ARGS+=--disable-distribution .endif -.include <bsd.port.mk> +.if !defined(WITHOUT_NLS) +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo index abc58ffe2..cc32715a1 100644 --- a/x11/workrave/distinfo +++ b/x11/workrave/distinfo @@ -1,3 +1,3 @@ -MD5 (workrave-1.8.3.tar.gz) = e1fe49f6fdf9d725bd21d50e2e0dc20d -SHA256 (workrave-1.8.3.tar.gz) = 411487f55d7e15e68618d30f9931bffafb3154cac36d7ea15ea5f80c3bbac10f -SIZE (workrave-1.8.3.tar.gz) = 1604897 +MD5 (workrave-1.8.5.tar.gz) = 3df48ab5600256fadc11a976f15bcc7a +SHA256 (workrave-1.8.5.tar.gz) = 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56 +SIZE (workrave-1.8.5.tar.gz) = 1940651 diff --git a/x11/workrave/files/patch-frontend__common__src__System.cc b/x11/workrave/files/patch-frontend__common__src__System.cc new file mode 100644 index 000000000..08aaad5de --- /dev/null +++ b/x11/workrave/files/patch-frontend__common__src__System.cc @@ -0,0 +1,10 @@ +--- frontend/common/src/System.cc.orig 2007-09-28 13:18:31.000000000 -0300 ++++ frontend/common/src/System.cc 2007-09-28 13:18:48.000000000 -0300 +@@ -28,6 +28,7 @@ + #include <stdio.h> + #include <string.h> + #include <strings.h> ++#include <sys/wait.h> + + #include "System.hh" + #include "debug.hh" diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist index d5769558d..c4f656043 100644 --- a/x11/workrave/pkg-plist +++ b/x11/workrave/pkg-plist @@ -23,6 +23,8 @@ share/workrave/exercises/exercises.xml share/workrave/exercises/eye-darkness.png share/workrave/exercises/finger-stretch-1.png share/workrave/exercises/finger-stretch-2.png +share/workrave/exercises/fist-roll-1.png +share/workrave/exercises/fist-roll-2.png share/workrave/exercises/monitor-border-1.png share/workrave/exercises/monitor-border-2.png share/workrave/exercises/monitor-border-3.png @@ -55,23 +57,32 @@ share/workrave/images/workrave-icon-small.png share/workrave/images/workrave-quiet-icon-medium.png share/workrave/images/workrave-suspended-icon-medium.png share/workrave/images/workrave.png -share/locale/ca/LC_MESSAGES/workrave.mo -share/locale/cs/LC_MESSAGES/workrave.mo -share/locale/da/LC_MESSAGES/workrave.mo -share/locale/de/LC_MESSAGES/workrave.mo -share/locale/eo/LC_MESSAGES/workrave.mo -share/locale/es/LC_MESSAGES/workrave.mo -share/locale/eu/LC_MESSAGES/workrave.mo -share/locale/fr/LC_MESSAGES/workrave.mo -share/locale/he/LC_MESSAGES/workrave.mo -share/locale/lt/LC_MESSAGES/workrave.mo -share/locale/nl/LC_MESSAGES/workrave.mo -share/locale/no/LC_MESSAGES/workrave.mo -share/locale/pl/LC_MESSAGES/workrave.mo -share/locale/pt_BR/LC_MESSAGES/workrave.mo -share/locale/ru/LC_MESSAGES/workrave.mo -share/locale/sv/LC_MESSAGES/workrave.mo -share/locale/zh_TW/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/da/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/de/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/el/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/eo/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/es/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/eu/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/fr/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/he/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/hu/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/it/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/ja/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/lt/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/nl/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/no/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/pl/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/ru/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/sk/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/sl/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/sv/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/tr/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/workrave.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/workrave.mo @dirrm share/workrave/images @dirrm share/workrave/exercises @dirrm share/workrave |