Hi,
here are diffs for graphics/libkexiv2, multimedia/k3b and x11/yakuake,
broken now that ksh is more strict in errexit mode.
graphics/libkexiv2 and x11/yakuake are just one Makefile.in patched
away, however k3b would involve patching 30+ files, so I preferred just
to USE_GMAKE (which doesn't use sh -e by default). If someone prefers
another solution for k3b, have fun. :)
I have no idea whether these ports were properly working but these
patches shouldn't make things worse.
ok?
Index: graphics/libkexiv2/patches/patch-libkexiv2_libkexiv2_Makefile_in
===================================================================
RCS file: graphics/libkexiv2/patches/patch-libkexiv2_libkexiv2_Makefile_in
diff -N graphics/libkexiv2/patches/patch-libkexiv2_libkexiv2_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/libkexiv2/patches/patch-libkexiv2_libkexiv2_Makefile_in 13 Jun
2013 11:47:50 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Don't fail when egrep doesn't find the desired string.
+--- libkexiv2/libkexiv2/Makefile.in.orig Thu Jun 13 13:46:23 2013
++++ libkexiv2/libkexiv2/Makefile.in Thu Jun 13 13:46:50 2013
+@@ -740,7 +740,7 @@ libkexiv2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcd
+ echo "#define KDE_USE_FINAL 1" >> libkexiv2_la.all_cpp.final; \
+ for file in kexiv2.cpp kexiv2private.cpp ; do \
+ echo "#include \"$$file\"" >> libkexiv2_la.all_cpp.files; \
+- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation'
$(srcdir)/$$file >> libkexiv2_la.all_cpp.final; \
++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation'
$(srcdir)/$$file >> libkexiv2_la.all_cpp.final || true; \
+ done; \
+ cat libkexiv2_la.all_cpp.final libkexiv2_la.all_cpp.files >
libkexiv2_la.all_cpp.cpp; \
+ rm -f libkexiv2_la.all_cpp.final libkexiv2_la.all_cpp.files
Index: multimedia/k3b/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/k3b/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- multimedia/k3b/Makefile 21 Mar 2013 08:46:33 -0000 1.23
+++ multimedia/k3b/Makefile 13 Jun 2013 22:48:49 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY = Yes
COMMENT = CD/DVD creator
DISTNAME = k3b-1.0.4
-REVISION= 16
+REVISION= 17
CATEGORIES = multimedia
SHARED_LIBS = k3b 0.0 # 3.0
@@ -51,6 +51,7 @@ LIB_DEPENDS = audio/flac \
graphics/jpeg \
x11/kde/libs3
+USE_GMAKE = Yes
LIBTOOL_FLAGS += --tag=disable-static
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-qt-dir=${MODQT_QTDIR} \
Index: x11/yakuake/patches/patch-yakuake_src_Makefile_in
===================================================================
RCS file: x11/yakuake/patches/patch-yakuake_src_Makefile_in
diff -N x11/yakuake/patches/patch-yakuake_src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/yakuake/patches/patch-yakuake_src_Makefile_in 13 Jun 2013 14:28:04
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+Don't fail when egrep doesn't find the desired string.
+--- yakuake/src/Makefile.in.orig Thu Jun 13 16:24:12 2013
++++ yakuake/src/Makefile.in Thu Jun 13 16:24:37 2013
+@@ -934,7 +934,7 @@ yakuake.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/f
+ echo "#define KDE_USE_FINAL 1" >> yakuake.all_cpp.final; \
+ for file in first_run_dialog.cpp general_settings.cpp image_button.cpp
main.cpp main_window.cpp session.cpp skin_list_item.cpp skin_settings.cpp
tabbed_widget.cpp tab_bar.cpp terminal.cpp terminal_focus_watcher.cpp
terminal_splitter.cpp title_bar.cpp translucent_widget.cpp
dcop_interface_skel.cpp first_run_dialog_ui.cpp general_settings_ui.cpp
skin_settings_ui.cpp settings.cpp ; do \
+ echo "#include \"$$file\"" >> yakuake.all_cpp.files; \
+- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation'
$(srcdir)/$$file >> yakuake.all_cpp.final; \
++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation'
$(srcdir)/$$file >> yakuake.all_cpp.final || true; \
+ done; \
+ cat yakuake.all_cpp.final yakuake.all_cpp.files > yakuake.all_cpp.cpp; \
+ rm -f yakuake.all_cpp.final yakuake.all_cpp.files
