Attachment #35244 for bug #56943

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

Lines 7-12 Link Here

(-)ports/www/oops/Makefile (+3 lines)
7		7
8	PORTNAME= oops	8	PORTNAME= oops
9	PORTVERSION= ${OOPSVERSION}.${OOPSDATE}	9	PORTVERSION= ${OOPSVERSION}.${OOPSDATE}
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= http://oops-cache.org/	12	MASTER_SITES= http://oops-cache.org/
12	DISTNAME= ${PORTNAME}-${OOPSVERSION}	13	DISTNAME= ${PORTNAME}-${OOPSVERSION}
Lines 31-36 Link Here
31	--libdir=${PREFIX}/libexec/oops \	32	--libdir=${PREFIX}/libexec/oops \
32	--enable-oops-user=oops \	33	--enable-oops-user=oops \
33	--enable-large-files	34	--enable-large-files
		35	MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		36	PTHREAD_LIBS="${PTHREAD_LIBS}"
34		37
35	MAN8= oops.8 oopsctl.8	38	MAN8= oops.8 oopsctl.8
36	OOPSVAR= /var/run/oops	39	OOPSVAR= /var/run/oops




--- configure.in.orig	Tue Sep 16 16:32:04 2003
+++ configure.in	Tue Sep 16 16:34:21 2003
@@ -37,7 +37,7 @@
 AC_ARG_WITH(zlib,--with-zlib=[[PATH]]         Which zlib library/object file to use,
   with_zlib="$withval", with_zlib="")

 AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
 AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
 
@@ -296,10 +296,9 @@
 	  LIBS="-oldstyle_liblookup -lpthread $LIBS"
 
 	  ;;
-freebsd*) CFLAGS="$CFLAGS -pthread -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
-	  CXX=g++
+freebsd*) CFLAGS="$CFLAGS $PTHREAD_CFLAGS -D_REENTRANT -DFREEBSD -DFD_SETSIZE=2048 -I."
 	  CXXSOFLAGS="-shared -Xlinker -Bstatic"
-	  LIBS="-lc_r $LEXLIB $LIBS"
+	  LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
 	  if test "$large_files" = "yes" ; then
 		## FreeBSD need no any special flags for 64bit files
 		CFLAGS="$CFLAGS -DWITH_LARGE_FILES"
@@ -375,10 +374,10 @@
 esac
 
 if test "X$MYSQL_PATH" != "X" ; then

 fi
 
 if test "X$PGSQL_PATH" != "X" ; then
@@ -427,6 +426,9 @@
     cp -f lib/rwlock/rwlock.h ./; 
     cd ..
     ;;
+freebsd*)
+    echo "Already have pthread_rwlock_init() support in our libc_r";
+    ;;
 *)
     AC_CHECK_FUNC(pthread_rwlock_init,AC_DEFINE(HAVE_PTHREAD_RWLOCK_INIT),EXTRASRC="$EXTRASRC rwlock.c" ; cd src; cp -f lib/rwlock/rwlock.c ./; cp -f lib/rwlock/rwlock.h ./; cd ..)
     ;;
@@ -464,6 +466,9 @@
     LIBDB_PATH="$pwd"
 elif test -r "/usr/local/lib/libdb.a"; then
     LIBDB_PATH="/usr/local"

 elif test -r "/usr/lib/libdb2.a"; then                                         
     LIBDB_PATH="/usr"                                                          
     LIBDB_NAME=-ldb2                                                           
@@ -574,7 +579,7 @@
     AC_DEFINE(HAVE_ZLIB)
     AC_MSG_RESULT(/usr/local/lib/libz.a)
     if test "X`echo $CFLAGS | grep '\-I/usr/local/include'`" = "X"; then




--- src/Makefile.in.orig	Tue Aug 19 15:56:34 2003
+++ src/Makefile.in	Tue Aug 19 15:58:11 2003
@@ -29,7 +29,7 @@
 
 #CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
 
-CFLAGS = @CFLAGS@ @DEFS@
+CFLAGS = @CFLAGS@ @DEFS@ ${PTHREAD_CFLAGS}
 
 VER=@VER@
 OOPSPATH=@prefix@/oops
@@ -45,7 +45,7 @@
 	cd modules; $(MAKE)
 
 oops:	${OBJS}
-	${CC} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
+	${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${PTHREAD_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
 
 mkinstalldirs:
 	../mkinstalldirs ${OOPSPATH} \

Added Link Here

(-)ports/www/oops/files/patch-src::modules::Makefile.in (+11 lines)
1	--- src/modules/Makefile.in.orig Tue Aug 19 16:36:50 2003
2	+++ src/modules/Makefile.in Tue Aug 19 16:37:09 2003
3	@@ -1,7 +1,7 @@
4	CC = @CC@
5	CXX = @CXX@
6	LIBS = @LIBS@
7	-CFLAGS = @CFLAGS@ @DEFS@
8	+CFLAGS = @CFLAGS@ @DEFS@ ${PTHREAD_CFLAGS}
9	LDFLAGS = @LDFLAGS@
10	LD = @LD@
11	SOFLAGS = @SOFLAGS@

Return to bug 56943

Lines 1-5 Link Here

(-)ports/www/oops/files/patch-configure.in (-5 / +28 lines)
1	--- configure.in.orig Fri Mar 21 18:46:36 2003	1	--- configure.in.orig Tue Sep 16 16:32:04 2003
2	+++ configure.in Fri Mar 21 18:54:01 2003	2	+++ configure.in Tue Sep 16 16:34:21 2003
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	AC_ARG_WITH(zlib,--with-zlib=[[PATH]] Which zlib library/object file to use,	4	AC_ARG_WITH(zlib,--with-zlib=[[PATH]] Which zlib library/object file to use,
5	with_zlib="$withval", with_zlib="")	5	with_zlib="$withval", with_zlib="")
Lines 9-15 Link Here
9	AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))	9	AC_CHECK_HEADERS(netinet/ip_fil.h, AC_DEFINE(HAVE_IPF))
10	AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))	10	AC_CHECK_HEADERS(netinet/ip6.h, AC_DEFINE(HAVE_IP6_H))
11		11
12	@@ -375,10 +375,10 @@	12	@@ -296,10 +296,9 @@
		13	LIBS="-oldstyle_liblookup -lpthread $LIBS"
		14
		15	;;
		16	-freebsd*) CFLAGS="$CFLAGS -pthread -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
		17	- CXX=g++
		18	+freebsd*) CFLAGS="$CFLAGS $PTHREAD_CFLAGS -D_REENTRANT -DFREEBSD -DFD_SETSIZE=2048 -I."
		19	CXXSOFLAGS="-shared -Xlinker -Bstatic"
		20	- LIBS="-lc_r $LEXLIB $LIBS"
		21	+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
		22	if test "$large_files" = "yes" ; then
		23	## FreeBSD need no any special flags for 64bit files
		24	CFLAGS="$CFLAGS -DWITH_LARGE_FILES"
		25	@@ -375,10 +374,10 @@
13	esac	26	esac
14		27
15	if test "X$MYSQL_PATH" != "X" ; then	28	if test "X$MYSQL_PATH" != "X" ; then
Lines 23-29 Link Here
23	fi	36	fi
24		37
25	if test "X$PGSQL_PATH" != "X" ; then	38	if test "X$PGSQL_PATH" != "X" ; then
26	@@ -464,6 +464,9 @@	39	@@ -427,6 +426,9 @@
		40	cp -f lib/rwlock/rwlock.h ./;
		41	cd ..
		42	;;
		43	+freebsd*)
		44	+ echo "Already have pthread_rwlock_init() support in our libc_r";
		45	+ ;;
		46	*)
		47	AC_CHECK_FUNC(pthread_rwlock_init,AC_DEFINE(HAVE_PTHREAD_RWLOCK_INIT),EXTRASRC="$EXTRASRC rwlock.c" ; cd src; cp -f lib/rwlock/rwlock.c ./; cp -f lib/rwlock/rwlock.h ./; cd ..)
		48	;;
		49	@@ -464,6 +466,9 @@
27	LIBDB_PATH="$pwd"	50	LIBDB_PATH="$pwd"
28	elif test -r "/usr/local/lib/libdb.a"; then	51	elif test -r "/usr/local/lib/libdb.a"; then
29	LIBDB_PATH="/usr/local"	52	LIBDB_PATH="/usr/local"
Lines 33-39 Link Here
33	elif test -r "/usr/lib/libdb2.a"; then	56	elif test -r "/usr/lib/libdb2.a"; then
34	LIBDB_PATH="/usr"	57	LIBDB_PATH="/usr"
35	LIBDB_NAME=-ldb2	58	LIBDB_NAME=-ldb2
36	@@ -574,7 +577,7 @@	59	@@ -574,7 +579,7 @@
37	AC_DEFINE(HAVE_ZLIB)	60	AC_DEFINE(HAVE_ZLIB)
38	AC_MSG_RESULT(/usr/local/lib/libz.a)	61	AC_MSG_RESULT(/usr/local/lib/libz.a)
39	if test "X`echo $CFLAGS \| grep '\-I/usr/local/include'`" = "X"; then	62	if test "X`echo $CFLAGS \| grep '\-I/usr/local/include'`" = "X"; then

Lines 1-11 Link Here

(-)ports/www/oops/files/patch-src::Makefile.in (-3 / +12 lines)
1	--- src/Makefile.in.orig Fri Mar 21 19:42:58 2003	1	--- src/Makefile.in.orig Tue Aug 19 15:56:34 2003
2	+++ src/Makefile.in Fri Mar 21 19:43:33 2003	2	+++ src/Makefile.in Tue Aug 19 15:58:11 2003
		3	@@ -29,7 +29,7 @@
		4
		5	#CFLAGS = -Wall -ggdb -D_REENTRANT -D_POSIX_PTHREADS_SEMANTICS
		6
		7	-CFLAGS = @CFLAGS@ @DEFS@
		8	+CFLAGS = @CFLAGS@ @DEFS@ ${PTHREAD_CFLAGS}
		9
		10	VER=@VER@
		11	OOPSPATH=@prefix@/oops
3	@@ -45,7 +45,7 @@	12	@@ -45,7 +45,7 @@
4	cd modules; $(MAKE)	13	cd modules; $(MAKE)
5		14
6	oops: ${OBJS}	15	oops: ${OBJS}
7	- ${CC} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops	16	- ${CC} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
8	+ ${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops	17	+ ${CXX} ${CFLAGS} ${OBJS} ${EXTLDFLAGS} ${LDFLAGS} ${LIBGB_PATH} ${LIBGB_NAME} ${OOPS_LIBS} ${PTHREAD_LIBS} ${LIBZ_NAME} ${OOPS_RPATH} -o oops
9		18
10	mkinstalldirs:	19	mkinstalldirs:
11	../mkinstalldirs ${OOPSPATH} \	20	../mkinstalldirs ${OOPSPATH} \