summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-07-31 03:58:05 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-07-31 03:58:05 +0800
commit9f4312d414f48e386f726118bc85ff0b94463c4f (patch)
tree6e9ee3874142698553bc1ed3a330d474c3a2ae54 /editors
parenta56b1567cab361fb1874785378752a094dc6c8d1 (diff)
downloadmarcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.tar
marcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.tar.gz
marcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.tar.bz2
marcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.tar.lz
marcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.tar.xz
marcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.tar.zst
marcuscom-ports-9f4312d414f48e386f726118bc85ff0b94463c4f.zip
Sync w/ FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9277 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'editors')
-rw-r--r--editors/dedit/Makefile8
-rw-r--r--editors/glimmer/files/patch-src_widgets_gnome-settings.c11
2 files changed, 18 insertions, 1 deletions
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);
+ }
+ }
+