Date: 15 Oct 2003 22:49:42 -0000 From: avleeuwen@piwebs.com To: FreeBSD-gnats-submit@FreeBSD.org Cc: lofi@FreeBSD.org Subject: ports/58095: Fix building audio/yammi without KDE Message-ID: <20031015224942.87666.qmail@thuis.piwebs.com> Resent-Message-ID: <200310152250.h9FMoOfb029197@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58095 >Category: ports >Synopsis: Fix building audio/yammi without KDE >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 15 15:50:23 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Arjan van Leeuwen >Release: FreeBSD 4.8-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD thuis.piwebs.com 4.8-RELEASE-p3 FreeBSD 4.8-RELEASE-p3 #0: Thu Aug 21 11:55:07 CEST 2003 avleeuwen@thuis.piwebs.com:/usr/obj/usr/src/sys/THUIS i386 >Description: This patch should unbreak building the yammi (audio/yammi) port when KDE is not installed. Tested on 5.1-CURRENT with no kdelibs installed. >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/yammi/Makefile yammi/Makefile --- /usr/ports/audio/yammi/Makefile Wed Oct 1 18:17:50 2003 +++ yammi/Makefile Thu Oct 16 00:34:22 2003 @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" -CONFIGURE_ARGS+= --program-prefix='' +CONFIGURE_ARGS+= --program-prefix='' --enable-threading=yes --enable-mt=yes USE_REINPLACE= yes .include <bsd.port.pre.mk> @@ -36,6 +36,8 @@ .if defined(WITH_NOATUN) BUILD_DEPENDS+= noatun:${PORTSDIR}/multimedia/kdemultimedia3 WITH_KDE=yes +.else +CONFIGURE_ARGS+= --disable-noatun .endif # defined(WITH_NOATUN) .if exists(${LOCALBASE}/lib/libkdecore.so) @@ -44,6 +46,8 @@ .if defined(WITH_KDE) USE_KDELIBS_VER=3 +.else +CONFIGURE_ARGS+= --disable-KDE .endif # defined(WITH_KDE) pre-configure:: diff -urN /usr/ports/audio/yammi/files/patch-configure yammi/files/patch-configure --- /usr/ports/audio/yammi/files/patch-configure Wed Oct 1 18:17:50 2003 +++ yammi/files/patch-configure Thu Oct 16 00:25:26 2003 @@ -1,6 +1,33 @@ ---- configure.orig Fri Sep 5 21:43:28 2003 -+++ configure Fri Sep 5 21:43:31 2003 -@@ -21260,7 +21260,7 @@ +--- configure.orig Sun Aug 31 23:25:52 2003 ++++ configure Thu Oct 16 00:24:50 2003 +@@ -19343,7 +19343,7 @@ + EOF + fi + +-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext ++echo "#if ! (1)" >> conftest.$ac_ext + cat >> conftest.$ac_ext <<EOF + #error 1 + #endif +@@ -19949,6 +19949,8 @@ + echo "$as_me:19949: result: $USE_RPATH" >&5 + echo "${ECHO_T}$USE_RPATH" >&6 + ++if test "x$configure_enable_KDE" = "xyes"; then ++ + echo "$as_me:19952: checking for KDE" >&5 + echo $ECHO_N "checking for KDE... $ECHO_C" >&6 + +@@ -21156,6 +21158,8 @@ + + fi + ++fi ++ + if test "x$configure_enable_KDE" = "xyes"; then + + DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" +@@ -21260,7 +21264,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9,7 +36,7 @@ cat >conftest.$ac_ext <<_ACEOF #line 21265 "configure" #include "confdefs.h" -@@ -21322,7 +21322,7 @@ +@@ -21322,7 +21326,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -18,7 +45,7 @@ cat >conftest.$ac_ext <<_ACEOF #line 21327 "configure" #include "confdefs.h" -@@ -21386,7 +21386,7 @@ +@@ -21386,7 +21390,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27,7 +54,7 @@ cat >conftest.$ac_ext <<_ACEOF #line 21391 "configure" #include "confdefs.h" -@@ -21450,7 +21450,7 @@ +@@ -21450,7 +21454,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -36,7 +63,7 @@ cat >conftest.$ac_ext <<_ACEOF #line 21455 "configure" #include "confdefs.h" -@@ -21498,7 +21498,7 @@ +@@ -21498,7 +21502,7 @@ #define HAVE_LIBGDK 1 EOF @@ -45,7 +72,7 @@ else configure_enable_ogglibs=no -@@ -21527,7 +21527,7 @@ +@@ -21527,7 +21531,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -54,7 +81,7 @@ cat >conftest.$ac_ext <<_ACEOF #line 21532 "configure" #include "confdefs.h" -@@ -21589,7 +21589,7 @@ +@@ -21589,7 +21593,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031015224942.87666.qmail>