Attachment #36173 for bug #58095

View | Details | Raw Unified | Return to bug 58095
Collapse All | Expand All

Lines 24-30 Link Here

(-)yammi/Makefile (-1 / +5 lines)
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \	25	CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
26	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	26	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
27	CONFIGURE_ARGS+= --program-prefix=''	27	CONFIGURE_ARGS+= --program-prefix='' --enable-threading=yes --enable-mt=yes
28	USE_REINPLACE= yes	28	USE_REINPLACE= yes
29		29
30	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
Lines 36-41 Link Here
36	.if defined(WITH_NOATUN)	36	.if defined(WITH_NOATUN)
37	BUILD_DEPENDS+= noatun:${PORTSDIR}/multimedia/kdemultimedia3	37	BUILD_DEPENDS+= noatun:${PORTSDIR}/multimedia/kdemultimedia3
38	WITH_KDE=yes	38	WITH_KDE=yes
		39	.else
		40	CONFIGURE_ARGS+= --disable-noatun
39	.endif # defined(WITH_NOATUN)	41	.endif # defined(WITH_NOATUN)
40		42
41	.if exists(${LOCALBASE}/lib/libkdecore.so)	43	.if exists(${LOCALBASE}/lib/libkdecore.so)
Lines 44-49 Link Here
44		46
45	.if defined(WITH_KDE)	47	.if defined(WITH_KDE)
46	USE_KDELIBS_VER=3	48	USE_KDELIBS_VER=3
		49	.else
		50	CONFIGURE_ARGS+= --disable-KDE
47	.endif # defined(WITH_KDE)	51	.endif # defined(WITH_KDE)
48		52
49	pre-configure::	53	pre-configure::




--- 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

 cat >conftest.$ac_ext <<_ACEOF
 #line 21265 "configure"
 #include "confdefs.h"
@@ -21322,7 +21326,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat >conftest.$ac_ext <<_ACEOF
 #line 21327 "configure"
 #include "confdefs.h"
@@ -21386,7 +21390,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat >conftest.$ac_ext <<_ACEOF
 #line 21391 "configure"
 #include "confdefs.h"
@@ -21450,7 +21454,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat >conftest.$ac_ext <<_ACEOF
 #line 21455 "configure"
 #include "confdefs.h"
@@ -21498,7 +21502,7 @@
 #define HAVE_LIBGDK 1
 EOF
 

 
 else
   configure_enable_ogglibs=no
@@ -21527,7 +21531,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat >conftest.$ac_ext <<_ACEOF
 #line 21532 "configure"
 #include "confdefs.h"
@@ -21589,7 +21593,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

Return to bug 58095

Lines 1-6 Link Here

(-)yammi/files/patch-configure (-9 / +36 lines)
1	--- configure.orig Fri Sep 5 21:43:28 2003	1	--- configure.orig Sun Aug 31 23:25:52 2003
2	+++ configure Fri Sep 5 21:43:31 2003	2	+++ configure Thu Oct 16 00:24:50 2003
3	@@ -21260,7 +21260,7 @@	3	@@ -19343,7 +19343,7 @@
		4	EOF
		5	fi
		6
		7	-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
		8	+echo "#if ! (1)" >> conftest.$ac_ext
		9	cat >> conftest.$ac_ext <<EOF
		10	#error 1
		11	#endif
		12	@@ -19949,6 +19949,8 @@
		13	echo "$as_me:19949: result: $USE_RPATH" >&5
		14	echo "${ECHO_T}$USE_RPATH" >&6
		15
		16	+if test "x$configure_enable_KDE" = "xyes"; then
		17	+
		18	echo "$as_me:19952: checking for KDE" >&5
		19	echo $ECHO_N "checking for KDE... $ECHO_C" >&6
		20
		21	@@ -21156,6 +21158,8 @@
		22
		23	fi
		24
		25	+fi
		26	+
		27	if test "x$configure_enable_KDE" = "xyes"; then
		28
		29	DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
		30	@@ -21260,7 +21264,7 @@
4	echo $ECHO_N "(cached) $ECHO_C" >&6	31	echo $ECHO_N "(cached) $ECHO_C" >&6
5	else	32	else
6	ac_check_lib_save_LIBS=$LIBS	33	ac_check_lib_save_LIBS=$LIBS
Lines 9-15 Link Here
9	cat >conftest.$ac_ext <<_ACEOF	36	cat >conftest.$ac_ext <<_ACEOF
10	#line 21265 "configure"	37	#line 21265 "configure"
11	#include "confdefs.h"	38	#include "confdefs.h"
12	@@ -21322,7 +21322,7 @@	39	@@ -21322,7 +21326,7 @@
13	echo $ECHO_N "(cached) $ECHO_C" >&6	40	echo $ECHO_N "(cached) $ECHO_C" >&6
14	else	41	else
15	ac_check_lib_save_LIBS=$LIBS	42	ac_check_lib_save_LIBS=$LIBS
Lines 18-24 Link Here
18	cat >conftest.$ac_ext <<_ACEOF	45	cat >conftest.$ac_ext <<_ACEOF
19	#line 21327 "configure"	46	#line 21327 "configure"
20	#include "confdefs.h"	47	#include "confdefs.h"
21	@@ -21386,7 +21386,7 @@	48	@@ -21386,7 +21390,7 @@
22	echo $ECHO_N "(cached) $ECHO_C" >&6	49	echo $ECHO_N "(cached) $ECHO_C" >&6
23	else	50	else
24	ac_check_lib_save_LIBS=$LIBS	51	ac_check_lib_save_LIBS=$LIBS
Lines 27-33 Link Here
27	cat >conftest.$ac_ext <<_ACEOF	54	cat >conftest.$ac_ext <<_ACEOF
28	#line 21391 "configure"	55	#line 21391 "configure"
29	#include "confdefs.h"	56	#include "confdefs.h"
30	@@ -21450,7 +21450,7 @@	57	@@ -21450,7 +21454,7 @@
31	echo $ECHO_N "(cached) $ECHO_C" >&6	58	echo $ECHO_N "(cached) $ECHO_C" >&6
32	else	59	else
33	ac_check_lib_save_LIBS=$LIBS	60	ac_check_lib_save_LIBS=$LIBS
Lines 36-42 Link Here
36	cat >conftest.$ac_ext <<_ACEOF	63	cat >conftest.$ac_ext <<_ACEOF
37	#line 21455 "configure"	64	#line 21455 "configure"
38	#include "confdefs.h"	65	#include "confdefs.h"
39	@@ -21498,7 +21498,7 @@	66	@@ -21498,7 +21502,7 @@
40	#define HAVE_LIBGDK 1	67	#define HAVE_LIBGDK 1
41	EOF	68	EOF
42		69
Lines 45-51 Link Here
45		72
46	else	73	else
47	configure_enable_ogglibs=no	74	configure_enable_ogglibs=no
48	@@ -21527,7 +21527,7 @@	75	@@ -21527,7 +21531,7 @@
49	echo $ECHO_N "(cached) $ECHO_C" >&6	76	echo $ECHO_N "(cached) $ECHO_C" >&6
50	else	77	else
51	ac_check_lib_save_LIBS=$LIBS	78	ac_check_lib_save_LIBS=$LIBS
Lines 54-60 Link Here
54	cat >conftest.$ac_ext <<_ACEOF	81	cat >conftest.$ac_ext <<_ACEOF
55	#line 21532 "configure"	82	#line 21532 "configure"
56	#include "confdefs.h"	83	#include "confdefs.h"
57	@@ -21589,7 +21589,7 @@	84	@@ -21589,7 +21593,7 @@
58	echo $ECHO_N "(cached) $ECHO_C" >&6	85	echo $ECHO_N "(cached) $ECHO_C" >&6
59	else	86	else
60	ac_check_lib_save_LIBS=$LIBS	87	ac_check_lib_save_LIBS=$LIBS