Attachment #44435 for bug #68812

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

Lines 6-12 Link Here

(-)gnokii/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gnokii	8	PORTNAME= gnokii
9	PORTVERSION= 0.6.1	9	PORTVERSION= 0.6.3
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= comms	11	CATEGORIES= comms
12	MASTER_SITES= ${MASTER_SITE_SAVANNAH} \	12	MASTER_SITES= ${MASTER_SITE_SAVANNAH} \

Lines 1-2 Link Here

(-)gnokii/distinfo (-2 / +2 lines)
1	MD5 (gnokii-0.6.1.tar.bz2) = 45521637ecb443f28558317aaee80bdf	1	MD5 (gnokii-0.6.3.tar.bz2) = 7e932688aeaa2ca8be2f2e3b3bf1b90e
2	SIZE (gnokii-0.6.1.tar.bz2) = 1777215	2	SIZE (gnokii-0.6.3.tar.bz2) = 1824992

Lines 1-6 Link Here

(-)gnokii/files/patch-Makefile.global.in (-7 / +5 lines)
1	--- Makefile.global.in.orig Tue Jul 8 23:33:22 2003	1	--- Makefile.global.in.orig Tue Jul 6 11:57:56 2004
2	+++ Makefile.global.in Tue Jul 8 23:33:03 2003	2	+++ Makefile.global.in Tue Jul 6 11:59:17 2004
3	@@ -22,15 +22,15 @@	3	@@ -21,14 +21,14 @@
4		4
5	bindir = @bindir@	5	bindir = @bindir@
6	sbindir = @sbindir@	6	sbindir = @sbindir@
Lines 14-22 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	-docdir = ${prefix}/doc/${PACKAGE}	17	+xmandir = ${prefix}/man/man1/
18	+xmandir = ${man1dir}	18	docdir = ${prefix}/share/doc/${PACKAGE}
19	+docdir = ${prefix}/share/doc/${PACKAGE}
20	locdir = @datadir@/locale	19	locdir = @datadir@/locale
21		20
22	BIN_MODE = 0755




--- configure.orig	Mon Jul  5 00:04:50 2004
+++ configure	Tue Jul  6 12:56:33 2004
@@ -26348,13 +26348,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_LIBS%%%%PTHREAD_CFLAGS%%" != x; then
+	PTHREAD_CFLAGS="%%PTHREAD_CFLAGS%%"
+	PTHREAD_LIBS="%%PTHREAD_LIBS%%"
         save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        CFLAGS="$CFLAGS %%PTHREAD_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%% $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
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26726,7 +26728,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




%%X11%%share/xgnokii/help/POSIX
%%X11%%share/xgnokii/help/en_US/COPYING
%%X11%%share/xgnokii/help/en_US/CREDITS
%%X11%%share/xgnokii/help/en_US/cables/cables.html
%%X11%%share/xgnokii/help/en_US/config.html
%%X11%%share/xgnokii/help/en_US/faq.html
%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
%%X11%%share/xgnokii/help/en_US/index.html
%%X11%%share/xgnokii/help/en_US/irda/irda.html
%%X11%%share/xgnokii/help/en_US/netmon/faq_net0.html
%%X11%%share/xgnokii/help/en_US/netmon/faq_net1.html
%%X11%%share/xgnokii/help/en_US/netmon/faq_net2.html

%%X11%%share/xgnokii/help/en_US/netmon/tip.png
%%X11%%share/xgnokii/help/en_US/sample/gnokiirc
%%X11%%share/xgnokii/help/en_US/styl.css
%%X11%%share/xgnokii/help/en_US/windows/calendar/index.html
%%X11%%share/xgnokii/help/en_US/windows/contacts/index.html
%%X11%%share/xgnokii/help/en_US/windows/dtmf/index.html
%%X11%%share/xgnokii/help/en_US/windows/main/index.html
%%X11%%share/xgnokii/help/en_US/windows/netmon/index.html
%%X11%%share/xgnokii/help/en_US/windows/sms/index.html
%%X11%%share/xgnokii/help/en_US/windows/speeddial/index.html
%%X11%%share/xgnokii/help/en_US/windows/xkeyb/index.html
%%X11%%share/xgnokii/help/pl_PL/calendar.html
%%X11%%share/xgnokii/help/pl_PL/contacts.html
%%X11%%share/xgnokii/help/pl_PL/dtmf.html

Return to bug 68812

Lines 107-118 Link Here

(-)gnokii/pkg-plist (-11 lines)
107	%%X11%%share/xgnokii/help/POSIX	107	%%X11%%share/xgnokii/help/POSIX
108	%%X11%%share/xgnokii/help/en_US/COPYING	108	%%X11%%share/xgnokii/help/en_US/COPYING
109	%%X11%%share/xgnokii/help/en_US/CREDITS	109	%%X11%%share/xgnokii/help/en_US/CREDITS
110	%%X11%%share/xgnokii/help/en_US/cables/cables.html
111	%%X11%%share/xgnokii/help/en_US/config.html
112	%%X11%%share/xgnokii/help/en_US/faq.html	110	%%X11%%share/xgnokii/help/en_US/faq.html
113	%%X11%%share/xgnokii/help/en_US/firmware/firmware.html	111	%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
114	%%X11%%share/xgnokii/help/en_US/index.html	112	%%X11%%share/xgnokii/help/en_US/index.html
115	%%X11%%share/xgnokii/help/en_US/irda/irda.html
116	%%X11%%share/xgnokii/help/en_US/netmon/faq_net0.html	113	%%X11%%share/xgnokii/help/en_US/netmon/faq_net0.html
117	%%X11%%share/xgnokii/help/en_US/netmon/faq_net1.html	114	%%X11%%share/xgnokii/help/en_US/netmon/faq_net1.html
118	%%X11%%share/xgnokii/help/en_US/netmon/faq_net2.html	115	%%X11%%share/xgnokii/help/en_US/netmon/faq_net2.html
Lines 130-143 Link Here
130	%%X11%%share/xgnokii/help/en_US/netmon/tip.png	127	%%X11%%share/xgnokii/help/en_US/netmon/tip.png
131	%%X11%%share/xgnokii/help/en_US/sample/gnokiirc	128	%%X11%%share/xgnokii/help/en_US/sample/gnokiirc
132	%%X11%%share/xgnokii/help/en_US/styl.css	129	%%X11%%share/xgnokii/help/en_US/styl.css
133	%%X11%%share/xgnokii/help/en_US/windows/calendar/index.html
134	%%X11%%share/xgnokii/help/en_US/windows/contacts/index.html
135	%%X11%%share/xgnokii/help/en_US/windows/dtmf/index.html
136	%%X11%%share/xgnokii/help/en_US/windows/main/index.html
137	%%X11%%share/xgnokii/help/en_US/windows/netmon/index.html
138	%%X11%%share/xgnokii/help/en_US/windows/sms/index.html
139	%%X11%%share/xgnokii/help/en_US/windows/speeddial/index.html
140	%%X11%%share/xgnokii/help/en_US/windows/xkeyb/index.html
141	%%X11%%share/xgnokii/help/pl_PL/calendar.html	130	%%X11%%share/xgnokii/help/pl_PL/calendar.html
142	%%X11%%share/xgnokii/help/pl_PL/contacts.html	131	%%X11%%share/xgnokii/help/pl_PL/contacts.html
143	%%X11%%share/xgnokii/help/pl_PL/dtmf.html	132	%%X11%%share/xgnokii/help/pl_PL/dtmf.html

Lines 1-13 Link Here

(-)gnokii/files/patch-configure (-13 / +32 lines)
1	--- configure.orig Tue May 20 20:29:43 2003	1	--- configure.orig Mon Jul 5 00:04:50 2004
2	+++ configure Tue May 20 20:30:35 2003	2	+++ configure Tue Jul 6 12:56:33 2004
3	@@ -6407,8 +6407,8 @@	3	@@ -26348,13 +26348,15 @@
4	echo "${ECHO_T}$ac_cv_lib_c_r_pthread_attr_init" >&6	4	# First of all, check if the user has set any of the PTHREAD_LIBS,
5	if test $ac_cv_lib_c_r_pthread_attr_init = yes; then	5	# etcetera environment variables, and if threads linking works using
6		6	# them:
7	- PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_THREAD_SAFE"	7	-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
8	- PTHREAD_LIBS="-pthread"	8	+if test x"%%PTHREAD_LIBS%%%%PTHREAD_CFLAGS%%" != x; then
9	+ PTHREAD_CFLAGS="$PTHREAD_CFLAGS %%PTHREAD_CFLAGS%%"	9	+ PTHREAD_CFLAGS="%%PTHREAD_CFLAGS%%"
10	+ PTHREAD_LIBS="%%PTHREAD_LIBS%%"	10	+ PTHREAD_LIBS="%%PTHREAD_LIBS%%"
11	fi	11	save_CFLAGS="$CFLAGS"
12		12	- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
13	fi	13	+ CFLAGS="$CFLAGS %%PTHREAD_CFLAGS%%"
		14	save_LIBS="$LIBS"
		15	- LIBS="$PTHREAD_LIBS $LIBS"
		16	- 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
		18	+ LIBS="%%PTHREAD_LIBS%% $LIBS"
		19	+ echo "$as_me:$LINENO: checking for pthread_join in LIBS=%%PTHREAD_LIBS%% with CFLAGS=%%PTHREAD_CFLAGS%%" >&5
		20	+echo $ECHO_N "checking for pthread_join in LIBS=%%PTHREAD_LIBS%% with CFLAGS=%%PTHREAD_CFLAGS%%... $ECHO_C" >&6
		21	cat >conftest.$ac_ext <<_ACEOF
		22	/* confdefs.h. */
		23	_ACEOF
		24	@@ -26726,7 +26728,7 @@
		25	echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6
		26	flag=no
		27	case "${host_cpu}-${host_os}" in
		28	- -aix \| -freebsd \| -darwin) flag="-D_THREAD_SAFE";;
		29	+ -aix \| -darwin) flag="-D_THREAD_SAFE";;
		30	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;
		31	esac
		32	echo "$as_me:$LINENO: result: ${flag}" >&5