summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/beast/Makefile10
-rw-r--r--audio/easytag-devel/Makefile9
-rw-r--r--audio/easytag-devel/distinfo6
-rw-r--r--audio/gnomoradio/Makefile12
-rw-r--r--audio/libao/files/patch-Makefile.in3
-rw-r--r--audio/rhythmbox-devel/Makefile6
-rw-r--r--audio/rhythmbox/Makefile6
-rw-r--r--chinese/srecite/Makefile5
-rw-r--r--databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc20
-rw-r--r--deskutils/chmsee/Makefile6
-rw-r--r--deskutils/gnome-utils/Makefile6
-rw-r--r--deskutils/gucharmap/Makefile4
-rw-r--r--devel/anjuta/Makefile7
-rw-r--r--devel/goffice/Makefile4
-rw-r--r--devel/nspr/Makefile4
-rw-r--r--editors/dedit/Makefile8
-rw-r--r--editors/glimmer/files/patch-src_widgets_gnome-settings.c11
17 files changed, 91 insertions, 36 deletions
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 18ddc0066..4d4e42c8b 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -3,7 +3,7 @@
# Whom: Jean-Yves Lefort <jylefort@brutele.be>
#
# $FreeBSD$
-# $MCom: ports/audio/beast/Makefile,v 1.3 2007/05/02 12:13:54 ahze Exp $
+#
PORTNAME= beast
PORTVERSION= 0.6.6
@@ -33,6 +33,12 @@ CONFIGURE_ARGS= --disable-debug \
MAN1= beast.1 bsesh.1 sfidl.1
MAN3= beast-gxk.3 bse-procs.3 bse-structs.3 bse.3 sfi.3
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700042
+BROKEN= Does not compile with GCC 4.2
+.endif
+
post-patch:
@${REINPLACE_CMD} -Ee 's|$${libdir}/ladspa|${LOCALBASE}/lib/ladspa|; \
/FLAGS=/ s/(-g|-ggdb3|-pipe|-O2|-ftracer|-finline-functions|-fno-keep-static-consts)//; \
@@ -42,4 +48,4 @@ post-patch:
${WRKSRC}/bse/Makefile.in \
${WRKSRC}/bse/zintern/Makefile.in
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index e24dc970a..51905d152 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= easytag
-PORTVERSION= 2.0
+PORTVERSION= 2.1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -32,4 +32,11 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
LDFLAGS="-L${LOCALBASE}/lib"
+.if defined(WITH_WAVPACK)
+LIB_DEPENDS+= wavpack.1:${PORTSDIR}/audio/wavpack
+CONFIGURE_ARGS+= --enable-wavpack
+.else
+CONFIGURE_ARGS+= --disable-wavpack
+.endif
+
.include <bsd.port.mk>
diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo
index c5aeac2c2..efbf60955 100644
--- a/audio/easytag-devel/distinfo
+++ b/audio/easytag-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (easytag-2.0.tar.bz2) = af37a0a34e4d0808aabb7a24cffc75ee
-SHA256 (easytag-2.0.tar.bz2) = 3935a1100c6afc499a263cbaf063ab422bd7b5b4099b1d3d869021ba9a063500
-SIZE (easytag-2.0.tar.bz2) = 2889829
+MD5 (easytag-2.1.tar.bz2) = a585cb9e400ba460ec1801856ea5e90f
+SHA256 (easytag-2.1.tar.bz2) = 8903771d33795d0e65c2ee6e7f09709c280cc1ae5878c20a201d7a4b06ff57e5
+SIZE (easytag-2.1.tar.bz2) = 2924032
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 1bbcd10fc..9a5070ffd 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -3,7 +3,7 @@
# Whom: Jean-Yves Lefort <jylefort@brutele.be>
#
# $FreeBSD$
-# $MCom: ports/audio/gnomoradio/Makefile,v 1.3 2007/05/02 14:20:48 ahze Exp $
+#
PORTNAME= gnomoradio
PORTVERSION= 0.15.1
@@ -26,14 +26,20 @@ USE_XLIB= yes
USE_GCC= 3.4+
USE_GNOME= gnomehack gnomeprefix
USE_AUTOTOOLS= libtool:15
-USE_LDCONFIG= yes
+USE_LDCONFIG= yes
LIBTOOLFLAGS= --tag=CXX
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700042
+BROKEN= Broken with gcc 4.2
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \
s|-lpthread|${PTHREAD_LIBS}|' \
${WRKSRC}/roboradio/mp3/Makefile.in
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in
index 71fbe45f4..493ebf83c 100644
--- a/audio/libao/files/patch-Makefile.in
+++ b/audio/libao/files/patch-Makefile.in
@@ -1,3 +1,6 @@
+
+$FreeBSD$
+
--- Makefile.in.orig 2007-07-14 18:06:32.000000000 -0400
+++ Makefile.in 2007-07-14 18:06:52.000000000 -0400
@@ -225,7 +225,7 @@ target_alias = @target_alias@
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 9ee0c9029..a158765ce 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.79 2007/06/10 18:49:50 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.80 2007/07/05 01:57:57 marcus Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.10.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
@@ -111,7 +111,7 @@ PLIST_SUB+= PYTHON="@comment "
.endif
.if !defined(WITHOUT_IPOD)
-LIB_DEPENDS+= gpod.1:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+= gpod.2:${PORTSDIR}/audio/libgpod
CONFIGURE_ARGS+=--with-ipod
PLIST_SUB+= IPOD=""
.else
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9ee0c9029..a158765ce 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.79 2007/06/10 18:49:50 marcus Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.80 2007/07/05 01:57:57 marcus Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.10.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
@@ -111,7 +111,7 @@ PLIST_SUB+= PYTHON="@comment "
.endif
.if !defined(WITHOUT_IPOD)
-LIB_DEPENDS+= gpod.1:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+= gpod.2:${PORTSDIR}/audio/libgpod
CONFIGURE_ARGS+=--with-ipod
PLIST_SUB+= IPOD=""
.else
diff --git a/chinese/srecite/Makefile b/chinese/srecite/Makefile
index 0607eb17e..6631dafe8 100644
--- a/chinese/srecite/Makefile
+++ b/chinese/srecite/Makefile
@@ -9,14 +9,13 @@ PORTNAME= srecite
PORTVERSION= 0.6.2
PORTREVISION= 5
CATEGORIES= chinese textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
wordbooks-utf8.tar.gz
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
wordbooks-utf8.tar.gz
-MAINTAINER= liu_yinghong@yahoo.com.cn
+MAINTAINER= relaxbsd@gmail.com
COMMENT= A tool for the Chinese people to study foreign language
GNU_CONFIGURE= yes
diff --git a/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
new file mode 100644
index 000000000..a83ec8738
--- /dev/null
+++ b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc
@@ -0,0 +1,20 @@
+--- glom/libglom/python_embed/py_glom_record.cc.orig Sun Jul 15 13:34:18 2007
++++ glom/libglom/python_embed/py_glom_record.cc Sun Jul 15 13:34:44 2007
+@@ -122,7 +122,7 @@
+
+
+
+-static int
++static Py_ssize_t
+ Record_tp_as_mapping_length(PyGlomRecord *self)
+ {
+ return self->m_pMap_field_values->size();
+@@ -146,7 +146,7 @@
+ }
+ else
+ {
+- g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", self->m_pMap_field_values->size(), pchKey);
++ g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self->m_pMap_field_values->size(), pchKey);
+ }
+ }
+ else
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 0c8813b18..44dbaca2e 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: chmsee
# Date created: 10 June 2006
-# Whom: Liu.Yinghong <liu_yinghong@yahoo.com.cn>
+# Whom: Yinghong Liu <relaxbsd@gmail.com>
#
# $FreeBSD$
#
@@ -11,11 +11,11 @@ PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= http://chmsee.gro.clinux.org/
-MAINTAINER= liu_yinghong@yahoo.com.cn
+MAINTAINER= relaxbsd@gmail.com
COMMENT= A viewer for Microsoft Help "CHM" files
LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib \
- gtkhtml-3.14:${PORTSDIR}/www/gtkhtml3
+ gtkhtml-3.14:${PORTSDIR}/www/gtkhtml3
USE_GETTEXT= yes
USE_GNOME= gtk20 libglade2 gnomeprefix gnomehack libgnome
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 9842a8e5e..a44382ac4 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.118 2007/05/19 21:36:03 marcus Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.119 2007/07/04 15:52:37 mezz Exp $
#
PORTNAME= gnome-utils
@@ -39,8 +39,4 @@ MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 \
GCONF_SCHEMAS= gnome-dictionary.schemas gnome-screenshot.schemas \
gnome-search-tool.schemas logview.schemas baobab.schemas
-post-patch:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} -n 10 \
- ${REINPLACE_CMD} -e 's|@mandir@|${MANPREFIX}/man|'
-
.include <bsd.port.mk>
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 52c598925..03b45a336 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.37 2007/04/28 18:11:37 marcus Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.38 2007/05/19 21:36:03 marcus Exp $
#
PORTNAME= gucharmap
@@ -33,7 +33,7 @@ INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.if defined(PACKAGE_BUILDING)
.undef WITHOUT_GNOME
.undef WITHOUT_ALL
WITH_GNOME= yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 820de5338..172bb83ab 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,12 +3,12 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/anjuta/Makefile,v 1.7 2007/07/22 02:25:26 marcus Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.8 2007/07/26 21:48:07 mezz Exp $
#
PORTNAME= anjuta
PORTVERSION= 2.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= anjuta
@@ -28,7 +28,8 @@ RUN_DEPENDS= ${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoc
bash:${PORTSDIR}/shells/bash \
autogen:${PORTSDIR}/devel/autogen \
neato:${PORTSDIR}/graphics/graphviz \
- libtool:${PORTSDIR}/devel/libtool15
+ libtool:${PORTSDIR}/devel/libtool15 \
+ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
USE_XLIB= yes
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 11c4f9445..3092f068f 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -3,9 +3,9 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/goffice/Makefile,v 1.29 2007/07/16 20:04:09 mezz Exp $
+# $MCom: ports/devel/goffice/Makefile,v 1.30 2007/07/29 19:37:40 marcus Exp $
#
-# !!! When updating goffice, don't forget to update and science/gchempaint pkg-plists too! !!!
+# !!! When updating goffice, don't forget to update science/gchempaint pkg-plists too! !!!
PORTNAME= goffice
PORTVERSION= 0.4.2
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index c2c3a4452..2c7a2f190 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/nspr/Makefile,v 1.1 2007/07/05 13:49:54 ahze Exp $
+# $MCom: ports/devel/nspr/Makefile,v 1.2 2007/07/10 14:52:05 ahze Exp $
PORTNAME= nspr
DISTVERSION= 4.6.7-1
@@ -71,7 +71,7 @@ libtests:
test: libtests prtests
-#.if defined(PARALLEL_PACKAGE_BUILD)
+#.if defined(PACKAGE_BUILDING)
#post-build: test
#.else
post-build:
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index e7427ca24..982e169b9 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -27,6 +27,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= dedit.1
MANLANG= "" ja
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700042
+BROKEN= Broken with gcc 4.2
+.endif
+
pre-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|dedit.ja.1||'
@@ -34,4 +40,4 @@ pre-patch:
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/glimmer/files/patch-src_widgets_gnome-settings.c b/editors/glimmer/files/patch-src_widgets_gnome-settings.c
new file mode 100644
index 000000000..82adbe246
--- /dev/null
+++ b/editors/glimmer/files/patch-src_widgets_gnome-settings.c
@@ -0,0 +1,11 @@
+--- src/widgets/gnome-settings.c.orig Tue Jul 3 15:45:49 2007
++++ src/widgets/gnome-settings.c Tue Jul 3 15:46:49 2007
+@@ -138,7 +138,7 @@ select_event (GtkCTree * tree, gint row,
+ gtk_widget_hide (settings->current);
+ if (data) {
+ gtk_widget_show (GTK_WIDGET (data));
+- (void *) settings->current = data;
++ settings->current = GTK_WIDGET (data);
+ }
+ }
+