Attachment #36286 for bug #58239

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





GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_GCC=	2.95
USE_REINPLACE=	yes
PLIST_SUB+=	PORTVERSION="${PORTVERSION}"

CONFIGURE_ARGS=	--with-pcre-dir=${LOCALBASE}/lib \
		--with-pcre-inc=${LOCALBASE}/include \
		--with-avcall-dir=${LOCALBASE}/lib \
		--with-avcall-inc=${LOCALBASE}/include

post-patch:
	${REINPLACE_CMD} \
		-e "s,^LIBS = @LIBS@,& ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lgetline," \
		-e "s,^CFLAGS = @CFLAGS@,& ${PTHREAD_CFLAGS}," \
		${WRKSRC}/Makefile.in
	${REINPLACE_CMD} \
		-e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure


.include <bsd.port.pre.mk>





--- configure.orig	Thu Jun 22 07:09:24 2000
+++ configure	Sun Oct 19 10:33:16 2003
@@ -1156,47 +1156,6 @@
   echo "$ac_t""no" 1>&6
 fi
 
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1164: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PERL" in
-  /*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PERL="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
-  ;;
-esac
-fi
-PERL="$ac_cv_path_PERL"
-if test -n "$PERL"; then
-  echo "$ac_t""$PERL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test "$PERL" = "no" ; then 
-	echo "configure: warning: Qscheme needs perl5 to rebuild sgtk interface from scratch" 1>&2
-fi
-
 echo $ac_n "checking for stack growing direction""... $ac_c" 1>&6
 echo "configure:1202: checking for stack growing direction" >&5
 stackdir=down
@@ -1289,54 +1248,6 @@
 fi
 
 
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1294: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`

 echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
 echo "configure:1342: checking for atan in -lm" >&5
 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
@@ -1385,14 +1296,14 @@
 { echo "configure: error: needs libm" 1>&2; exit 1; }
 fi
 
-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1390: checking for pthread_create in -lpthread" >&5
+echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+echo "configure:1390: checking for pthread_create in -lc_r" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lpthread  $LIBS"
+LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1398 "configure"
 #include "confdefs.h"
@@ -1426,7 +1337,7 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="-lc_r $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
@@ -2485,7 +2396,7 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 

 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2585,7 +2496,7 @@
 
 cat >> $CONFIG_STATUS <<EOF

Return to bug 58239

Lines 19-31 Link Here

(-)lang/qscheme/Makefile (-1 / +11 lines)
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	#USE_AUTOCONF= yes	22	USE_GCC= 2.95
		23	USE_REINPLACE= yes
23	PLIST_SUB+= PORTVERSION="${PORTVERSION}"	24	PLIST_SUB+= PORTVERSION="${PORTVERSION}"
24		25
25	CONFIGURE_ARGS= --with-pcre-dir=${LOCALBASE}/lib \	26	CONFIGURE_ARGS= --with-pcre-dir=${LOCALBASE}/lib \
26	--with-pcre-inc=${LOCALBASE}/include \	27	--with-pcre-inc=${LOCALBASE}/include \
27	--with-avcall-dir=${LOCALBASE}/lib \	28	--with-avcall-dir=${LOCALBASE}/lib \
28	--with-avcall-inc=${LOCALBASE}/include	29	--with-avcall-inc=${LOCALBASE}/include
		30
		31	post-patch:
		32	${REINPLACE_CMD} \
		33	-e "s,^LIBS = @LIBS@,& ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lgetline," \
		34	-e "s,^CFLAGS = @CFLAGS@,& ${PTHREAD_CFLAGS}," \
		35	${WRKSRC}/Makefile.in
		36	${REINPLACE_CMD} \
		37	-e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
		38
29		39
30	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
31		41

Lines 1-10 Link Here

(-)lang/qscheme/files/patch-configure (-12 / +59 lines)
1	--- configure.orig Thu Jun 22 06:09:24 2000	1	--- configure.orig Thu Jun 22 07:09:24 2000
2	+++ configure Sun Feb 10 12:51:27 2002	2	+++ configure Sun Oct 19 10:33:16 2003
3	@@ -1288,55 +1288,6 @@	3	@@ -1156,47 +1156,6 @@
4	rm -fr conftest*	4	echo "$ac_t""no" 1>&6
5	fi	5	fi
6		6
7	-	7	-
		8	-# Extract the first word of "perl", so it can be a program name with args.
		9	-set dummy perl; ac_word=$2
		10	-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
		11	-echo "configure:1164: checking for $ac_word" >&5
		12	-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
		13	- echo $ac_n "(cached) $ac_c" 1>&6
		14	-else
		15	- case "$PERL" in
		16	- /*)
		17	- ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
		18	- ;;
		19	- ?:/*)
		20	- ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
		21	- ;;
		22	- *)
		23	- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
		24	- ac_dummy="$PATH"
		25	- for ac_dir in $ac_dummy; do
		26	- test -z "$ac_dir" && ac_dir=.
		27	- if test -f $ac_dir/$ac_word; then
		28	- ac_cv_path_PERL="$ac_dir/$ac_word"
		29	- break
		30	- fi
		31	- done
		32	- IFS="$ac_save_ifs"
		33	- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
		34	- ;;
		35	-esac
		36	-fi
		37	-PERL="$ac_cv_path_PERL"
		38	-if test -n "$PERL"; then
		39	- echo "$ac_t""$PERL" 1>&6
		40	-else
		41	- echo "$ac_t""no" 1>&6
		42	-fi
		43	-
		44	-if test "$PERL" = "no" ; then
		45	- echo "configure: warning: Qscheme needs perl5 to rebuild sgtk interface from scratch" 1>&2
		46	-fi
		47	-
		48	echo $ac_n "checking for stack growing direction""... $ac_c" 1>&6
		49	echo "configure:1202: checking for stack growing direction" >&5
		50	stackdir=down
		51	@@ -1289,54 +1248,6 @@
		52	fi
		53
		54
8	-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6	55	-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
9	-echo "configure:1294: checking for dlopen in -ldl" >&5	56	-echo "configure:1294: checking for dlopen in -ldl" >&5
10	-ac_lib_var=`echo dl'_'dlopen \| sed 'y%./+-%__p_%'`	57	-ac_lib_var=`echo dl'_'dlopen \| sed 'y%./+-%__p_%'`
Lines 56-89 Link Here
56	echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6	103	echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
57	echo "configure:1342: checking for atan in -lm" >&5	104	echo "configure:1342: checking for atan in -lm" >&5
58	ac_lib_var=`echo m'_'atan \| sed 'y%./+-%__p_%'`	105	ac_lib_var=`echo m'_'atan \| sed 'y%./+-%__p_%'`
59	@@ -1385,14 +1336,14 @@	106	@@ -1385,14 +1296,14 @@
60	{ echo "configure: error: needs libm" 1>&2; exit 1; }	107	{ echo "configure: error: needs libm" 1>&2; exit 1; }
61	fi	108	fi
62		109
63	-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6	110	-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
64	-echo "configure:1390: checking for pthread_create in -lpthread" >&5	111	-echo "configure:1390: checking for pthread_create in -lpthread" >&5
65	+echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6	112	+echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
66	+echo "configure:1390: checking for pthread_create in -pthread" >&5	113	+echo "configure:1390: checking for pthread_create in -lc_r" >&5
67	ac_lib_var=`echo pthread'_'pthread_create \| sed 'y%./+-%__p_%'`	114	ac_lib_var=`echo pthread'_'pthread_create \| sed 'y%./+-%__p_%'`
68	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then	115	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69	echo $ac_n "(cached) $ac_c" 1>&6	116	echo $ac_n "(cached) $ac_c" 1>&6
70	else	117	else
71	ac_save_LIBS="$LIBS"	118	ac_save_LIBS="$LIBS"
72	-LIBS="-lpthread $LIBS"	119	-LIBS="-lpthread $LIBS"
73	+LIBS="-pthread $LIBS"	120	+LIBS="-lc_r $LIBS"
74	cat > conftest.$ac_ext <<EOF	121	cat > conftest.$ac_ext <<EOF
75	#line 1398 "configure"	122	#line 1398 "configure"
76	#include "confdefs.h"	123	#include "confdefs.h"
77	@@ -1426,7 +1377,7 @@	124	@@ -1426,7 +1337,7 @@
78	#define $ac_tr_lib 1	125	#define $ac_tr_lib 1
79	EOF	126	EOF
80		127
81	- LIBS="-lpthread $LIBS"	128	- LIBS="-lpthread $LIBS"
82	+ LIBS="-pthread -L/usr/local/lib -lgetline $LIBS"	129	+ LIBS="-lc_r $LIBS"
83		130
84	else	131	else
85	echo "$ac_t""no" 1>&6	132	echo "$ac_t""no" 1>&6
86	@@ -2485,7 +2436,7 @@	133	@@ -2485,7 +2396,7 @@
87	ac_given_srcdir=$srcdir	134	ac_given_srcdir=$srcdir
88	ac_given_INSTALL="$INSTALL"	135	ac_given_INSTALL="$INSTALL"
89		136
Lines 92-98 Link Here
92	EOF	139	EOF
93	cat >> $CONFIG_STATUS <<EOF	140	cat >> $CONFIG_STATUS <<EOF
94		141
95	@@ -2585,7 +2536,7 @@	142	@@ -2585,7 +2496,7 @@
96		143
97	cat >> $CONFIG_STATUS <<EOF	144	cat >> $CONFIG_STATUS <<EOF