Attachment #79296 for bug #113926

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

Lines 6-13 Link Here

(-)gnokii/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= gnokii	8	PORTNAME= gnokii
9	PORTVERSION= 0.6.14	9	PORTVERSION= 0.6.16
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= comms	11	CATEGORIES= comms
13	MASTER_SITES= http://www.gnokii.org/download/gnokii/ \	12	MASTER_SITES= http://www.gnokii.org/download/gnokii/ \
Lines 28-34 Link Here
28	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \	27	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fPIC" \
29	LIBS="-L../common -L${LOCALBASE}/lib"	28	LIBS="-L../common -L${LOCALBASE}/lib"
30		29
31	MAN1= gnokii.1 todologo.1 ppm2nokia.1 sendsms.1	30	MAN1= gnokii.1 sendsms.1
32	MAN8= gnokiid.8 mgnokiidev.8	31	MAN8= gnokiid.8 mgnokiidev.8
33	PORTDOCS= *	32	PORTDOCS= *
34		33

Lines 1-3 Link Here

(-)gnokii/distinfo (-3 / +3 lines)
1	MD5 (gnokii-0.6.14.tar.bz2) = 89449d613c7a7e765a0d8da57ef1bb88	1	MD5 (gnokii-0.6.16.tar.bz2) = d0b48ec1decf180c81445d6e9e4199a3
2	SHA256 (gnokii-0.6.14.tar.bz2) = cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7	2	SHA256 (gnokii-0.6.16.tar.bz2) = 08685ae4b321e0f7cc16447841fbf0f66830b04de88104097cec3fc1d7a15918
3	SIZE (gnokii-0.6.14.tar.bz2) = 1546845	3	SIZE (gnokii-0.6.16.tar.bz2) = 1734019

Lines 1-5 Link Here

(-)gnokii/files/patch-Makefile.global.in (-4 / +4 lines)
1	--- Makefile.global.in.orig Wed May 18 15:08:43 2005	1	--- Makefile.global.in.orig Thu May 10 20:50:16 2007
2	+++ Makefile.global.in Wed May 18 15:11:40 2005	2	+++ Makefile.global.in Thu Jun 21 23:18:13 2007
3	@@ -21,14 +21,14 @@	3	@@ -21,14 +21,14 @@
4		4
5	bindir = @bindir@	5	bindir = @bindir@
Lines 14-20 Link Here
14	man1dir = ${mandir}/man1/	14	man1dir = ${mandir}/man1/
15	man8dir = ${mandir}/man8/	15	man8dir = ${mandir}/man8/
16	-xmandir = @XGNOKIIDIR@/man/man1/	16	-xmandir = @XGNOKIIDIR@/man/man1/
17	+xmandir = ${prefix}/man/man1/	17	+xmandir = ${mandir}/man1/
18	docdir = ${prefix}/share/doc/${PACKAGE}	18	docdir = ${prefix}/share/doc/${PACKAGE}
19	locdir = @datadir@/locale	19	locdir = @datadir@/locale
20		20	datadir = @datadir@




--- configure.orig	Thu May 10 20:50:32 2007
+++ configure	Thu Jun 21 23:16:04 2007
@@ -976,7 +976,7 @@
 psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+mandir='${prefix}/man'
 
 ac_prev=
 ac_dashdash=
@@ -26321,13 +26321,15 @@
 # First of all, check if the user has set any of the PTHREAD_LIBS,
 # etcetera environment variables, and if threads linking works using
 # them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+if test x"-pthread" != x; then
+	PTHREAD_CFLAGS=""
+	PTHREAD_LIBS="-pthread"
         save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        CFLAGS="$CFLAGS "
         save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
+        LIBS="-pthread $LIBS"
+        { echo "$as_me:$LINENO: checking for pthread_join in LIBS=-pthread with CFLAGS=" >&5
+echo $ECHO_N "checking for pthread_join in LIBS=-pthread with CFLAGS=... $ECHO_C" >&6; }
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26691,7 +26693,7 @@
 echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
         flag=no
         case "${host_cpu}-${host_os}" in
-                *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+                *-aix* | *-darwin*) flag="-D_THREAD_SAFE";;
                 *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
         esac
         { echo "$as_me:$LINENO: result: ${flag}" >&5
@@ -27495,7 +27497,7 @@
 
 if test "$enable_libical" == "yes"; then
 	OLD_CFLAGS="$CFLAGS"
-	LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
+	LIBS="$LIBS $ICAL_LIBS -pthread -lical"
 	CFLAGS="$CFLAGS $ICAL_CFLAGS"
 	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5
 echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }
@@ -29039,7 +29041,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
 if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
-   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"
+   XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"
                   cat >>confdefs.h <<\_ACEOF
 #define XPM 1
 _ACEOF




--- gnokii/gnokii-security.c.orig	Thu May 10 20:50:16 2007
+++ gnokii/gnokii-security.c	Thu Jun 21 11:56:13 2007
@@ -131,12 +131,14 @@
 
 	if (isatty(fd)) {
 		strncpy(pass, getpass(prompt), length - 1);
+/*		FreeBSD uses standard C library, no getline, sorry.
 	} else {
 		err = getline(&s, &s_len, stdin);
 		if (err > 0 && s) {
 			strncpy(pass, s, length - 1);
 			free(s);
 		}
+*/
 	}
 	pass[length - 1] = 0;
 #endif

Lines 1-8 Link Here

(-)gnokii/pkg-plist (-4 / +1 lines)
1	bin/gnokii	1	bin/gnokii
2	bin/ppm2nokia
3	bin/sendsms	2	bin/sendsms
4	bin/todologo
5	bin/waitcall
6	%%X11%%bin/xgnokii	3	%%X11%%bin/xgnokii
7	etc/gnokiirc.sample	4	etc/gnokiirc.sample
8	include/gnokii.h	5	include/gnokii.h
Lines 23-29 Link Here
23	lib/libgnokii.a	20	lib/libgnokii.a
24	lib/libgnokii.la	21	lib/libgnokii.la
25	lib/libgnokii.so	22	lib/libgnokii.so
26	lib/libgnokii.so.3	23	lib/libgnokii.so.4
27	libdata/pkgconfig/gnokii.pc	24	libdata/pkgconfig/gnokii.pc
28	libdata/pkgconfig/xgnokii.pc	25	libdata/pkgconfig/xgnokii.pc
29	sbin/gnokiid	26	sbin/gnokiid

Return to bug 113926

Lines 1-50 Link Here

(-)gnokii/files/patch-configure (-28 / +37 lines)
1	--- configure.orig Fri Apr 29 22:40:40 2005	1	--- configure.orig Thu May 10 20:50:32 2007
2	+++ configure Thu May 5 14:20:32 2005	2	+++ configure Thu Jun 21 23:16:04 2007
3	@@ -26347,13 +26347,15 @@	3	@@ -976,7 +976,7 @@
		4	psdir='${docdir}'
		5	libdir='${exec_prefix}/lib'
		6	localedir='${datarootdir}/locale'
		7	-mandir='${datarootdir}/man'
		8	+mandir='${prefix}/man'
		9
		10	ac_prev=
		11	ac_dashdash=
		12	@@ -26321,13 +26321,15 @@
4	# First of all, check if the user has set any of the PTHREAD_LIBS,	13	# First of all, check if the user has set any of the PTHREAD_LIBS,
5	# etcetera environment variables, and if threads linking works using	14	# etcetera environment variables, and if threads linking works using
6	# them:	15	# them:
7	-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then	16	-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
8	+if test x"%%PTHREAD_LIBS%%%%PTHREAD_CFLAGS%%" != x; then	17	+if test x"-pthread" != x; then
9	+ PTHREAD_CFLAGS="%%PTHREAD_CFLAGS%%"	18	+ PTHREAD_CFLAGS=""
10	+ PTHREAD_LIBS="%%PTHREAD_LIBS%%"	19	+ PTHREAD_LIBS="-pthread"
11	save_CFLAGS="$CFLAGS"	20	save_CFLAGS="$CFLAGS"
12	- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"	21	- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
13	+ CFLAGS="$CFLAGS %%PTHREAD_CFLAGS%%"	22	+ CFLAGS="$CFLAGS "
14	save_LIBS="$LIBS"	23	save_LIBS="$LIBS"
15	- LIBS="$PTHREAD_LIBS $LIBS"	24	- LIBS="$PTHREAD_LIBS $LIBS"
16	- echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5	25	- { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
17	-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6	26	-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }
18	+ LIBS="%%PTHREAD_LIBS%% $LIBS"	27	+ LIBS="-pthread $LIBS"
19	+ echo "$as_me:$LINENO: checking for pthread_join in LIBS=%%PTHREAD_LIBS%% with CFLAGS=%%PTHREAD_CFLAGS%%" >&5	28	+ { echo "$as_me:$LINENO: checking for pthread_join in LIBS=-pthread with CFLAGS=" >&5
20	+echo $ECHO_N "checking for pthread_join in LIBS=%%PTHREAD_LIBS%% with CFLAGS=%%PTHREAD_CFLAGS%%... $ECHO_C" >&6	29	+echo $ECHO_N "checking for pthread_join in LIBS=-pthread with CFLAGS=... $ECHO_C" >&6; }
21	cat >conftest.$ac_ext <<_ACEOF	30	cat >conftest.$ac_ext <<_ACEOF
22	/* confdefs.h. */	31	/* confdefs.h. */
23	_ACEOF	32	_ACEOF
24	@@ -26725,7 +26727,7 @@	33	@@ -26691,7 +26693,7 @@
25	echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6	34	echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
26	flag=no	35	flag=no
27	case "${host_cpu}-${host_os}" in	36	case "${host_cpu}-${host_os}" in
28	- -aix \| -freebsd \| -darwin) flag="-D_THREAD_SAFE";;	37	- -aix \| -freebsd \| -darwin) flag="-D_THREAD_SAFE";;
29	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;	38	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;
30	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;	39	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;
31	esac	40	esac
32	echo "$as_me:$LINENO: result: ${flag}" >&5	41	{ echo "$as_me:$LINENO: result: ${flag}" >&5
33	@@ -27569,7 +27571,7 @@	42	@@ -27495,7 +27497,7 @@
34	USE_LIBICAL="no"	43
35	OLD_LIBS="$LIBS"	44	if test "$enable_libical" == "yes"; then
36	OLD_CFLAGS="$CFLAGS"	45	OLD_CFLAGS="$CFLAGS"
37	-LIBS="$LIBS $ICAL_LIBS -lpthread -lical"	46	- LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
38	+LIBS="$LIBS $ICAL_LIBS -L/usr/local %%PTHREAD_LIBS%% -lical"	47	+ LIBS="$LIBS $ICAL_LIBS -pthread -lical"
39	CFLAGS="$CFLAGS $ICAL_CFLAGS"	48	CFLAGS="$CFLAGS $ICAL_CFLAGS"
40	echo "$as_me:$LINENO: checking whether libical is installed" >&5	49	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5
41	echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6	50	echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }
42	@@ -29111,7 +29113,7 @@	51	@@ -29039,7 +29041,7 @@
43	echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5	52	{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5
44	echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6	53	echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
45	if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then	54	if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
46	- XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"	55	- XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"
47	+ XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"	56	+ XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"
48	cat >>confdefs.h <<\_ACEOF	57	cat >>confdefs.h <<\_ACEOF
49	#define XPM 1	58	#define XPM 1
50	_ACEOF	59	_ACEOF

Line 0 Link Here

(-)gnokii/files/patch-gnokii-gnokii-security.c (+17 lines)
	1	--- gnokii/gnokii-security.c.orig Thu May 10 20:50:16 2007
	2	+++ gnokii/gnokii-security.c Thu Jun 21 11:56:13 2007
	3	@@ -131,12 +131,14 @@
	4
	5	if (isatty(fd)) {
	6	strncpy(pass, getpass(prompt), length - 1);
	7	+/* FreeBSD uses standard C library, no getline, sorry.
	8	} else {
	9	err = getline(&s, &s_len, stdin);
	10	if (err > 0 && s) {
	11	strncpy(pass, s, length - 1);
	12	free(s);
	13	}
	14	+*/
	15	}
	16	pass[length - 1] = 0;
	17	#endif