Attachment #83044 for bug #118692

View | Details | Raw Unified | Return to bug 118692
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.18	9	PORTVERSION= 0.6.22
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 32-38 Link Here
32	MAN8= gnokiid.8 mgnokiidev.8	31	MAN8= gnokiid.8 mgnokiidev.8
33	PORTDOCS= *	32	PORTDOCS= *
34		33
35	INSTALL_TARGET= install-suid	34	INSTALL_TARGET= install-binaries install-docs install-includes
36	PKGDEINSTALL= ${PKGINSTALL}	35	PKGDEINSTALL= ${PKGINSTALL}
37	PKGMESSAGE= ${WRKDIR}/pkg-message	36	PKGMESSAGE= ${WRKDIR}/pkg-message
38		37

Lines 1-3 Link Here

(-)gnokii/distinfo (-3 / +3 lines)
1	MD5 (gnokii-0.6.18.tar.bz2) = 0060f876414a22914ded4201335298ad	1	MD5 (gnokii-0.6.22.tar.bz2) = 15d64a4911735ee30c03a7bfa9b60f05
2	SHA256 (gnokii-0.6.18.tar.bz2) = 9b47279e0659a3c1e4bd35c48112dcbd2e4c30038bb589de1dab6f580827ada5	2	SHA256 (gnokii-0.6.22.tar.bz2) = 9c72fdb581bc0a3653962931592439489be7d9306cd71e94b48689545aeb7be0
3	SIZE (gnokii-0.6.18.tar.bz2) = 1756016	3	SIZE (gnokii-0.6.22.tar.bz2) = 1808129

Lines 1-5 Link Here

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




--- common/Makefile.orig	2007-11-24 12:31:01.000000000 +0100
+++ common/Makefile	2007-12-06 12:02:39.000000000 +0100
@@ -107,8 +107,8 @@
 	@echo "done"
 
 install-devel: install
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL_DATA) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
+	$(INSTALL_DATA) gnokii.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
 	@echo "done"
 
 depend dep:




--- configure.orig	2007-11-24 12:31:25.000000000 +0100
+++ configure	2007-12-06 12:08:24.000000000 +0100
@@ -981,7 +981,7 @@
 psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'

 
 ac_prev=
 ac_dashdash=
@@ -26588,13 +26588,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:

         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26958,7 +26960,7 @@
 echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
         flag=no
         case "${host_cpu}-${host_os}" in

                 *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
         esac
         { echo "$as_me:$LINENO: result: ${flag}" >&5
@@ -27762,7 +27764,7 @@
 
 if test "$enable_libical" == "yes"; then
 	OLD_CFLAGS="$CFLAGS"

 	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; }
@@ -29577,7 +29579,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="$XLIBS -lXpm -lX11"
+                  XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
                   cat >>confdefs.h <<\_ACEOF
 #define XPM 1
 _ACEOF

Line 0 Link Here

(-)gnokii/files/patch-gnokii-gnokii-utils.c (+11 lines)
	1	--- gnokii/gnokii-utils.c.orig 2007-12-06 14:24:37.000000000 +0100
	2	+++ gnokii/gnokii-utils.c 2007-12-06 14:25:25.000000000 +0100
	3	@@ -43,6 +43,8 @@
	4
	5	#include <stdio.h>
	6	#include <signal.h>
	7	+#include <sys/types.h>
	8	+#include <sys/stat.h>
	9
	10	#include "gnokii-app.h"
	11	#include "gnokii.h"




lib/libgnokii.a
lib/libgnokii.la
lib/libgnokii.so
lib/libgnokii.so.9
libdata/pkgconfig/gnokii.pc
libdata/pkgconfig/xgnokii.pc
sbin/gnokiid

%%PGM%%share/smsd/sms.tables.pq.sql
%%SMSD%%@dirrm lib/smsd
%%SMSD%%@dirrm share/smsd
%%X11%%share/applications/xgnokii.desktop
%%X11%%share/xgnokii/help/C
%%X11%%share/xgnokii/help/POSIX
%%X11%%share/xgnokii/help/en_US/COPYING

%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/cables
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/irda
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/calendar
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/contacts
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/dtmf
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/main
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/netmon
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/sms
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/speeddial
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/xkeyb
%%X11%%@exec mkdir -p %D/share/doc/gnokii/sample/vCard
%%X11%%@dirrm share/xgnokii/help/en_US/cables
%%X11%%@dirrm share/xgnokii/help/en_US/calendar
%%X11%%@dirrm share/xgnokii/help/en_US/contacts

Return to bug 118692

Lines 1-13 Link Here

(-)gnokii/files/patch-common-Makefile (-8 / +8 lines)
1	--- common/Makefile.orig Sun Feb 1 16:59:32 2004	1	--- common/Makefile.orig 2007-11-24 12:31:01.000000000 +0100
2	+++ common/Makefile Fri Feb 13 20:02:19 2004	2	+++ common/Makefile 2007-12-06 12:02:39.000000000 +0100
3	@@ -89,8 +89,8 @@	3	@@ -107,8 +107,8 @@
4	install:	4	@echo "done"
5	$(INSTALL) -d $(DESTDIR)$(libdir)	5
6	$(LIBTOOL) --mode=install $(INSTALL) libgnokii.la $(DESTDIR)$(libdir)	6	install-devel: install
7	- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig	7	- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
8	- $(INSTALL_DATA) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig	8	- $(INSTALL_DATA) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig
9	+ $(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig	9	+ $(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
10	+ $(INSTALL_DATA) gnokii.pc $(DESTDIR)$(prefix)/libdata/pkgconfig	10	+ $(INSTALL_DATA) gnokii.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
11	@echo	11	@echo "done"
12		12
13	install-strip: install	13	depend dep:

Lines 1-6 Link Here

(-)gnokii/files/patch-configure (-10 / +10 lines)
1	--- configure.orig Thu May 10 20:50:32 2007	1	--- configure.orig 2007-11-24 12:31:25.000000000 +0100
2	+++ configure Thu Jun 21 23:16:04 2007	2	+++ configure 2007-12-06 12:08:24.000000000 +0100
3	@@ -976,7 +976,7 @@	3	@@ -981,7 +981,7 @@
4	psdir='${docdir}'	4	psdir='${docdir}'
5	libdir='${exec_prefix}/lib'	5	libdir='${exec_prefix}/lib'
6	localedir='${datarootdir}/locale'	6	localedir='${datarootdir}/locale'
Lines 9-15 Link Here
9		9
10	ac_prev=	10	ac_prev=
11	ac_dashdash=	11	ac_dashdash=
12	@@ -26321,13 +26321,15 @@	12	@@ -26588,13 +26588,15 @@
13	# 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,
14	# etcetera environment variables, and if threads linking works using	14	# etcetera environment variables, and if threads linking works using
15	# them:	15	# them:
Lines 30-36 Link Here
30	cat >conftest.$ac_ext <<_ACEOF	30	cat >conftest.$ac_ext <<_ACEOF
31	/* confdefs.h. */	31	/* confdefs.h. */
32	_ACEOF	32	_ACEOF
33	@@ -26691,7 +26693,7 @@	33	@@ -26958,7 +26960,7 @@
34	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; }
35	flag=no	35	flag=no
36	case "${host_cpu}-${host_os}" in	36	case "${host_cpu}-${host_os}" in
Lines 39-45 Link Here
39	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;	39	solaris \| -osf \| -hpux) flag="-D_REENTRANT";;
40	esac	40	esac
41	{ echo "$as_me:$LINENO: result: ${flag}" >&5	41	{ echo "$as_me:$LINENO: result: ${flag}" >&5
42	@@ -27495,7 +27497,7 @@	42	@@ -27762,7 +27764,7 @@
43		43
44	if test "$enable_libical" == "yes"; then	44	if test "$enable_libical" == "yes"; then
45	OLD_CFLAGS="$CFLAGS"	45	OLD_CFLAGS="$CFLAGS"
Lines 48-59 Link Here
48	CFLAGS="$CFLAGS $ICAL_CFLAGS"	48	CFLAGS="$CFLAGS $ICAL_CFLAGS"
49	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5	49	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5
50	echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }	50	echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }
51	@@ -29039,7 +29041,7 @@	51	@@ -29577,7 +29579,7 @@
52	{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5
53	echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }	52	echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
54	if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then	53	if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
55	- XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11"	54	XPM_CFLAGS="$XINCL"
56	+ XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt"	55	- XPM_LIBS="$XLIBS -lXpm -lX11"
		56	+ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
57	cat >>confdefs.h <<\_ACEOF	57	cat >>confdefs.h <<\_ACEOF
58	#define XPM 1	58	#define XPM 1
59	_ACEOF	59	_ACEOF

Lines 20-26 Link Here

(-)gnokii/pkg-plist (-1 / +11 lines)
20	lib/libgnokii.a	20	lib/libgnokii.a
21	lib/libgnokii.la	21	lib/libgnokii.la
22	lib/libgnokii.so	22	lib/libgnokii.so
23	lib/libgnokii.so.6	23	lib/libgnokii.so.9
24	libdata/pkgconfig/gnokii.pc	24	libdata/pkgconfig/gnokii.pc
25	libdata/pkgconfig/xgnokii.pc	25	libdata/pkgconfig/xgnokii.pc
26	sbin/gnokiid	26	sbin/gnokiid
Lines 53-58 Link Here
53	%%PGM%%share/smsd/sms.tables.pq.sql	53	%%PGM%%share/smsd/sms.tables.pq.sql
54	%%SMSD%%@dirrm lib/smsd	54	%%SMSD%%@dirrm lib/smsd
55	%%SMSD%%@dirrm share/smsd	55	%%SMSD%%@dirrm share/smsd
		56	%%X11%%share/applications/xgnokii.desktop
56	%%X11%%share/xgnokii/help/C	57	%%X11%%share/xgnokii/help/C
57	%%X11%%share/xgnokii/help/POSIX	58	%%X11%%share/xgnokii/help/POSIX
58	%%X11%%share/xgnokii/help/en_US/COPYING	59	%%X11%%share/xgnokii/help/en_US/COPYING
Lines 129-134 Link Here
129	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/cables	130	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/cables
130	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/irda	131	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/irda
131	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows	132	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows
		133	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/calendar
		134	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/contacts
		135	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/dtmf
		136	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/main
		137	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/netmon
		138	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/sms
		139	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/speeddial
		140	%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/xkeyb
		141	%%X11%%@exec mkdir -p %D/share/doc/gnokii/sample/vCard
132	%%X11%%@dirrm share/xgnokii/help/en_US/cables	142	%%X11%%@dirrm share/xgnokii/help/en_US/cables
133	%%X11%%@dirrm share/xgnokii/help/en_US/calendar	143	%%X11%%@dirrm share/xgnokii/help/en_US/calendar
134	%%X11%%@dirrm share/xgnokii/help/en_US/contacts	144	%%X11%%@dirrm share/xgnokii/help/en_US/contacts