Attachment 33204 Details for Bug 54498 – file.diff

[patch] file.diff

file.diff (text/plain), 9.01 KB, created by Guido Falsi on 2003-07-15 12:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2003-07-15 12:10:11 UTC

Size: 9.01 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 54498: 33204 | 33205