View | Details | Raw Unified | Return to bug 54498 | Differences between
and this patch

Collapse All | Expand All

(-)gnokii/Makefile (-3 / +65 lines)
Lines 6-16 Link Here
6
#
6
#
7
7
8
PORTNAME=	gnokii
8
PORTNAME=	gnokii
9
PORTVERSION=	0.5.0
9
PORTVERSION=	0.5.2
10
PORTEPOCH=	1
10
PORTEPOCH=	1
11
CATEGORIES=	comms
11
CATEGORIES=	comms
12
MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/ \
12
MASTER_SITES=	http://savannah.nongnu.org/download/gnokii/ \
13
		http://freesoftware.fsf.org/download/gnokii/ \
14
		ftp://ftp.gnokii.org/pub/gnokii/
13
		ftp://ftp.gnokii.org/pub/gnokii/
15
14
16
MAINTAINER=	anders@FreeBSD.org
15
MAINTAINER=	anders@FreeBSD.org
Lines 18-25 Link Here
18
17
19
LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
18
LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
20
19
20
# If smsd is enabled check if MySQL or PostgreSQL are installed and
21
# build the modules, no switches to make this port build those, if
22
# you want them, just install them before this port. The port will
23
# then activate a dependency.
24
.if !defined(WITH_SMSD)
25
@${ECHO}
26
@${ECHO} "If you plan using the smsd daemon for automatically receiving,"
27
@${ECHO} "managing and sending SMSes define WITH_SMSD=yes."
28
@${ECHO} "smsd has support for normal file system operations, MySQL and"
29
@${ECHO} "PostgreSQL. If any of these 2 database systems are installed support"
30
@${ECHO} "will be automatically compiled in. Normal file systems support is"
31
@${ECHO} "always compiled in."
32
@${ECHO}
33
PLIST_SUB+=	SMSD='@comment '
34
PLIST_SUB+=	PGM='@comment '
35
PLIST_SUB+=	MSM='@comment '
36
.else
37
PLIST_SUB+=	SMSD=''
38
.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so)
39
LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
40
PLIST_SUB+=	MSM=''
41
WITH_MYSQL=	yes
42
.else
43
PLIST_SUB+=	MSM='@comment '
44
.endif
45
.if exists(${LOCALBASE}/lib/libpq.so)
46
LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
47
PLIST_SUB+=	PGM=''
48
WITH_PGSQL=	yes
49
.else
50
PLIST_SUB+=	PGM='@comment '
51
.endif
52
.endif
53
21
USE_REINPLACE=	yes
54
USE_REINPLACE=	yes
22
USE_GMAKE=	yes
55
USE_GMAKE=	yes
56
USE_BZIP2=	yes
23
.if !defined(WITHOUT_X11)
57
.if !defined(WITHOUT_X11)
24
USE_XPM=	yes
58
USE_XPM=	yes
25
USE_GNOME=	gtk12
59
USE_GNOME=	gtk12
Lines 36-41 Link Here
36
.else
70
.else
37
PLIST_SUB+=	X11=''
71
PLIST_SUB+=	X11=''
38
.endif
72
.endif
73
39
CONFIGURE_ENV+=	MSGFMT="${LOCALBASE}/bin/msgfmt" \
74
CONFIGURE_ENV+=	MSGFMT="${LOCALBASE}/bin/msgfmt" \
40
		XGETTEXT="${LOCALBASE}/bin/xgettext" \
75
		XGETTEXT="${LOCALBASE}/bin/xgettext" \
41
		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
76
		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
Lines 65-70 Link Here
65
		${WRKSRC}/${f}
100
		${WRKSRC}/${f}
66
.endfor
101
.endfor
67
102
103
post-build:
104
.if defined(WITH_SMSD)
105
	@cd ${WRKSRC}/smsd && ${GMAKE} all
106
	@cd ${WRKSRC}/smsd && ${GMAKE} libfile.so
107
.if defined(WITH_MYSQL)
108
	@cd ${WRKSRC}/smsd && ${GMAKE} libmysql.so
109
.endif
110
.if defined(WITH_PGSQL)
111
	@cd ${WRKSRC}/smsd && ${GMAKE} libpq.so
112
.endif
113
.endif
114
68
pre-install:
115
pre-install:
69
	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
116
	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
70
117
Lines 73-78 Link Here
73
	@(cd ${WRKSRC} && ${GMAKE} install-docs)
120
	@(cd ${WRKSRC} && ${GMAKE} install-docs)
74
	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
121
	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
75
		${PREFIX}/etc/gnokiirc.sample
122
		${PREFIX}/etc/gnokiirc.sample
123
.if defined(WITH_SMSD)
124
	${MKDIR} ${PREFIX}/share/smsd
125
	${INSTALL_PROGRAM} ${WRKSRC}/smsd/smsd ${PREFIX}/sbin/smsd
126
	${INSTALL_SCRIPT} ${WRKSRC}/smsd/action ${PREFIX}/share/smsd/action
127
	${INSTALL_DATA} ${WRKSRC}/smsd/README ${PREFIX}/share/smsd/README
128
	${INSTALL_PROGRAM} ${WRKSRC}/smsd/libfile.so ${PREFIX}/share/smsd/libfile.so
129
.if defined(WITH_MYSQL)
130
	${INSTALL_PROGRAM} ${WRKSRC}/smsd/libmysql.so ${PREFIX}/share/smsd/libmysql.so
131
	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.mysql.sql ${PREFIX}/share/smsd/sms.tables.mysql.sql
132
.endif
133
.if defined(WITH_PGSQL)
134
	${INSTALL_PROGRAM} ${WRKSRC}/smsd/libpq.so ${PREFIX}/share/smsd/libpq.so
135
	${INSTALL_DATA} ${WRKSRC}/smsd/sms.tables.pq.sql ${PREFIX}/share/smsd/sms.tables.pq.sql
136
.endif
137
.endif
76
	@${CAT} ${PKGMESSAGE}
138
	@${CAT} ${PKGMESSAGE}
77
139
78
.include <bsd.port.mk>
140
.include <bsd.port.mk>
(-)gnokii/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (gnokii-0.5.0.tar.gz) = 30c8f3e2c6ef684578500cba088006df
1
MD5 (gnokii-0.5.2.tar.bz2) = e11c7eb39f346cea125bcda8098c242a
(-)gnokii/files/patch-Docs-Makefile (-7 / +7 lines)
Lines 1-6 Link Here
1
--- Docs/Makefile.orig	Tue May 20 20:53:33 2003
1
--- Docs/Makefile.orig	Tue Jul  8 23:23:28 2003
2
+++ Docs/Makefile	Tue May 20 20:54:25 2003
2
+++ Docs/Makefile	Tue Jul  8 23:24:48 2003
3
@@ -62,6 +62,7 @@
3
@@ -63,6 +63,7 @@
4
 	@echo
4
 	@echo
5
 
5
 
6
 install:
6
 install:
Lines 8-19 Link Here
8
 	$(INSTALL) -d $(DESTDIR)$(docdir)
8
 	$(INSTALL) -d $(DESTDIR)$(docdir)
9
 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/logo
9
 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/logo
10
 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/ringtone
10
 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/ringtone
11
@@ -78,10 +79,10 @@
11
@@ -79,10 +80,10 @@
12
 	$(INSTALL) $(GNOKII1_MAN) $(DESTDIR)$(man1dir)
12
 	$(INSTALL_DATA) $(GNOKII1_MAN) $(DESTDIR)$(man1dir)
13
 	$(INSTALL) $(GNOKII8_MAN) $(DESTDIR)$(man8dir)
13
 	$(INSTALL_DATA) $(GNOKII8_MAN) $(DESTDIR)$(man8dir)
14
 	if [ "x$(HAVE_XGNOKII)" = "xyes" ]; then \
14
 	if [ "x$(HAVE_XGNOKII)" = "xyes" ]; then \
15
-		$(INSTALL) -d $(DESTDIR)$(xmandir); \
15
-		$(INSTALL) -d $(DESTDIR)$(xmandir); \
16
-		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)$(xmandir); \
16
-		$(INSTALL_DATA) $(XGNOKII_MAN) $(DESTDIR)$(xmandir); \
17
+		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)/$(xmandir)/xgnokii.1; \
17
+		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)/$(xmandir)/xgnokii.1; \
18
 	fi
18
 	fi
19
 	@echo "done"
19
 	@echo "done"
(-)gnokii/files/patch-Makefile.global.in (-5 / +6 lines)
Lines 1-6 Link Here
1
--- Makefile.global.in.orig	Tue May 20 20:34:17 2003
1
--- Makefile.global.in.orig	Tue Jul  8 23:33:22 2003
2
+++ Makefile.global.in	Tue May 20 20:37:15 2003
2
+++ Makefile.global.in	Tue Jul  8 23:33:03 2003
3
@@ -22,14 +22,14 @@
3
@@ -22,15 +22,15 @@
4
 
4
 
5
 bindir         = @bindir@
5
 bindir         = @bindir@
6
 sbindir        = @sbindir@
6
 sbindir        = @sbindir@
Lines 10-17 Link Here
10
-xgnokii_libdir = @XGNOKIIDIR@/share/@XPACKAGE@
10
-xgnokii_libdir = @XGNOKIIDIR@/share/@XPACKAGE@
11
+xgnokii_libdir = ${prefix}/share/@XPACKAGE@
11
+xgnokii_libdir = ${prefix}/share/@XPACKAGE@
12
 includedir     = @includedir@
12
 includedir     = @includedir@
13
 man1dir        = @mandir@/man1/
13
 mandir         = @mandir@
14
 man8dir        = @mandir@/man8/
14
 man1dir        = ${mandir}/man1/
15
 man8dir        = ${mandir}/man8/
15
-xmandir        = @XGNOKIIDIR@/man/man1/
16
-xmandir        = @XGNOKIIDIR@/man/man1/
16
-docdir         = ${prefix}/doc/${PACKAGE}
17
-docdir         = ${prefix}/doc/${PACKAGE}
17
+xmandir        = ${man1dir}
18
+xmandir        = ${man1dir}
(-)gnokii/files/patch-smsd-Makefile (+51 lines)
Line 0 Link Here
1
--- smsd/Makefile.orig	Wed Jul  9 10:01:26 2003
2
+++ smsd/Makefile	Wed Jul  9 10:03:20 2003
3
@@ -9,15 +9,15 @@
4
 TOPDIR=..
5
 include $(TOPDIR)/Makefile.global
6
 
7
-CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) \
8
+CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) -I/usr/local/include \
9
 	  `glib-config --cflags`
10
 
11
 LDLIBS += $(PTHREAD_LIBS) \
12
 	   `glib-config --libs`
13
 
14
-LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -ldl
15
+# LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -ldl
16
 # Some systems, eg. FreeBSD don't have libdl. Use this:
17
-# LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii
18
+LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii
19
 
20
 ifdef XPM_LIBS
21
 	LDLIBS +=$(XPM_LIBS)
22
@@ -30,7 +30,7 @@
23
 
24
 
25
 smsd: $(OBJS) $(TOPDIR)/common/libgnokii.so
26
-	gcc $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
27
+	$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
28
 
29
 
30
 ### DB Modules
31
@@ -39,17 +39,17 @@
32
 
33
 # PostgreSQL support
34
 libpq.so: smsd.h pq.c
35
-	gcc -s -shared -o libpq.so $(CFLAGS) -I../include \
36
+	$(CC) -s -shared -o libpq.so $(CFLAGS) -I../include \
37
 	-I/usr/include/pgsql pq.c `glib-config --libs` -lpq
38
 
39
 # MySQL support
40
 libmysql.so: smsd.h mysql.c
41
-	gcc -s -shared -o libmysql.so $(CFLAGS) -I../include \
42
+	$(CC) -s -shared -o libmysql.so $(CFLAGS) -I../include \
43
 	$(shell mysql_config --cflags) mysql.c `glib-config --libs` $(shell mysql_config --libs)
44
 
45
 # File support
46
 libfile.so: smsd.h file.c
47
-	gcc -s -shared -o libfile.so $(CFLAGS) -I../include \
48
+	$(CC) -s -shared -o libfile.so $(CFLAGS) -I../include \
49
         file.c `glib-config --libs`
50
 
51
 ### End of DB Modules
(-)gnokii/pkg-message (+3 lines)
Lines 7-10 Link Here
7
7
8
Add the users that shall be authorized to run gnokii programs to the
8
Add the users that shall be authorized to run gnokii programs to the
9
gnokii group.
9
gnokii group.
10
11
NOTE: if you have anabled and plan using the smsd program check
12
${PREFIX}/share/smsd/README
10
================================================================================
13
================================================================================
(-)gnokii/pkg-plist (+10 lines)
Lines 3-8 Link Here
3
bin/sendsms
3
bin/sendsms
4
bin/todologo
4
bin/todologo
5
%%X11%%bin/xgnokii
5
%%X11%%bin/xgnokii
6
%%SMSD%%sbin/smsd
6
etc/gnokiirc.sample
7
etc/gnokiirc.sample
7
include/gnokii.h
8
include/gnokii.h
8
include/gnokii/bitmaps.h
9
include/gnokii/bitmaps.h
Lines 27-32 Link Here
27
%%PORTDOCS%%share/doc/gnokii/Bugs
28
%%PORTDOCS%%share/doc/gnokii/Bugs
28
%%PORTDOCS%%share/doc/gnokii/CREDITS
29
%%PORTDOCS%%share/doc/gnokii/CREDITS
29
%%PORTDOCS%%share/doc/gnokii/DataCalls-QuickStart
30
%%PORTDOCS%%share/doc/gnokii/DataCalls-QuickStart
31
%%PORTDOCS%%share/doc/gnokii/gnokii.nol
30
%%PORTDOCS%%share/doc/gnokii/README
32
%%PORTDOCS%%share/doc/gnokii/README
31
%%PORTDOCS%%share/doc/gnokii/README-2110
33
%%PORTDOCS%%share/doc/gnokii/README-2110
32
%%PORTDOCS%%share/doc/gnokii/README-3810
34
%%PORTDOCS%%share/doc/gnokii/README-3810
Lines 82-87 Link Here
82
share/locale/pl/LC_MESSAGES/gnokii.mo
84
share/locale/pl/LC_MESSAGES/gnokii.mo
83
share/locale/sk/LC_MESSAGES/gnokii.mo
85
share/locale/sk/LC_MESSAGES/gnokii.mo
84
share/locale/sl/LC_MESSAGES/gnokii.mo
86
share/locale/sl/LC_MESSAGES/gnokii.mo
87
%%SMSD%%share/smsd/action
88
%%SMSD%%share/smsd/README
89
%%SMSD%%share/smsd/libfile.so
90
%%MSM%%share/smsd/libmysql.so
91
%%MSM%%share/smsd/sms.tables.mysql.sql
92
%%PGM%%share/smsd/libpq.so
93
%%PGM%%share/smsd/sms.tables.pq.sql
94
%%SMSD%%@dirrm share/smsd
85
%%X11%%share/xgnokii/help/C
95
%%X11%%share/xgnokii/help/C
86
%%X11%%share/xgnokii/help/POSIX
96
%%X11%%share/xgnokii/help/POSIX
87
%%X11%%share/xgnokii/help/en_US/COPYING
97
%%X11%%share/xgnokii/help/en_US/COPYING

Return to bug 54498