diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index a81ab325992d..8665d4a1d6f2 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -6,17 +6,16 @@ # PORTNAME= gnokii -PORTVERSION= 0.5.8 -PORTREVISION= 1 +PORTVERSION= 0.5.10 PORTEPOCH= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ - ftp://ftp.pl.gnokii.org/pub/gnokii/ \ - ftp://ftp.gnokii.org/pub/gnokii/ + http://www.gnokii.org/download/ \ + ftp://ftp.pl.gnokii.org/pub/gnokii/ MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org -COMMENT= Tools to talk to Nokia cellular phones +MAINTAINER= mad@madpilot.net +COMMENT= Tools to talk to GSM cellular phones USE_REINPLACE= yes USE_GETTEXT= yes @@ -56,6 +55,7 @@ PLIST_SUB+= MSM='@comment ' USE_GNOME+= glib12 .else PLIST_SUB+= SMSD='' +MAN8+= smsd.8 .if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so) USE_MYSQL= yes PLIST_SUB+= MSM='' @@ -107,12 +107,12 @@ post-patch: post-build: .if defined(WITH_SMSD) @cd ${WRKSRC}/smsd && ${GMAKE} all - @cd ${WRKSRC}/smsd && ${GMAKE} libfile.so LOCALBASE=${LOCALBASE} + @cd ${WRKSRC}/smsd && ${GMAKE} libfile.la LOCALBASE=${LOCALBASE} .if defined(WITH_MYSQL) - @cd ${WRKSRC}/smsd && ${GMAKE} libmysql.so LOCALBASE=${LOCALBASE} + @cd ${WRKSRC}/smsd && ${GMAKE} libmysql.la LOCALBASE=${LOCALBASE} .endif .if defined(WITH_PGSQL) - @cd ${WRKSRC}/smsd && ${GMAKE} libpq.so LOCALBASE=${LOCALBASE} + @cd ${WRKSRC}/smsd && ${GMAKE} libpq.la LOCALBASE=${LOCALBASE} .endif .endif @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' pkg-message > ${PKGMESSAGE} @@ -128,17 +128,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \ ${PREFIX}/etc/gnokiirc.sample .if defined(WITH_SMSD) + @cd ${WRKSRC}/smsd && ${GMAKE} install ${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 diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo index b42fdc89cf28..edcfe8fcdaa7 100644 --- a/comms/gnokii/distinfo +++ b/comms/gnokii/distinfo @@ -1,2 +1,2 @@ -MD5 (gnokii-0.5.8.tar.bz2) = 04f46c4089e71cd95d4d0f2f98bcda37 -SIZE (gnokii-0.5.8.tar.bz2) = 1351655 +MD5 (gnokii-0.5.10.tar.bz2) = 2c1919774f5948b8d291d32267df70e2 +SIZE (gnokii-0.5.10.tar.bz2) = 1499489 diff --git a/comms/gnokii/files/patch-common-Makefile b/comms/gnokii/files/patch-common-Makefile index 00c0c733f254..b1d130e86631 100644 --- a/comms/gnokii/files/patch-common-Makefile +++ b/comms/gnokii/files/patch-common-Makefile @@ -1,24 +1,9 @@ ---- common/Makefile.orig Thu Jan 8 14:46:16 2004 -+++ common/Makefile Thu Jan 8 15:12:15 2004 -@@ -73,8 +73,7 @@ - $(CC) -o gnokii-debug $(LIBS) $(XPM_LIBS) $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o ../gnokii/gnokii.o - - libgnokii.so: $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o -- $(CC) -shared -Wl,-soname,$(GNOKII_LIBM) -o $(GNOKII_LIBMM) $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o -- ln -sf $(GNOKII_LIBMM) $(GNOKII_LIBM) -+ $(CC) -shared -Wl,-soname,$(GNOKII_LIBM) -o $(GNOKII_LIBM) $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o - ln -sf $(GNOKII_LIBM) $(GNOKII_LIB) - - libgnokii.a: $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o -@@ -103,12 +102,11 @@ +--- common/Makefile.orig Sun Feb 1 16:59:32 2004 ++++ common/Makefile Fri Feb 13 20:02:19 2004 +@@ -89,8 +89,8 @@ + install: $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) $(GNOKII_STATIC) $(DESTDIR)$(libdir) - ifndef NO_SHARED -- $(INSTALL) $(GNOKII_LIBMM) $(DESTDIR)$(libdir) -- cd $(DESTDIR)$(libdir) && ln -sf $(GNOKII_LIBMM) $(GNOKII_LIBM) -+ $(INSTALL) $(GNOKII_LIBM) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(GNOKII_LIBM) $(GNOKII_LIB) - endif + $(LIBTOOL) --mode=install $(INSTALL) libgnokii.la $(DESTDIR)$(libdir) - $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig - $(INSTALL_DATA) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig + $(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig diff --git a/comms/gnokii/files/patch-po-Makefile.in.in b/comms/gnokii/files/patch-po-Makefile.in.in deleted file mode 100644 index 79af0f06f158..000000000000 --- a/comms/gnokii/files/patch-po-Makefile.in.in +++ /dev/null @@ -1,12 +0,0 @@ ---- po/Makefile.in.in.orig Tue May 20 23:06:48 2003 -+++ po/Makefile.in.in Tue May 20 23:09:16 2003 -@@ -209,6 +209,9 @@ - done; \ - done - -+install-suid: install -+ @echo -+ - # Define this as empty until I found a useful application. - installcheck: - diff --git a/comms/gnokii/files/patch-smsd-Makefile b/comms/gnokii/files/patch-smsd-Makefile index 1f4f74924d4b..4d4e7a5c73a9 100644 --- a/comms/gnokii/files/patch-smsd-Makefile +++ b/comms/gnokii/files/patch-smsd-Makefile @@ -1,17 +1,11 @@ ---- smsd/Makefile.orig Thu Jan 8 15:21:13 2004 -+++ smsd/Makefile Thu Jan 8 15:24:58 2004 -@@ -21,14 +21,14 @@ - SMSD_MAN=man/smsd.8 - - CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) \ -- $(shell $(GLIBCFLAGS)) -+ $(shell $(GLIBCFLAGS)) -I$(LOCALBASE)/include - +--- smsd/Makefile.orig Fri Feb 13 18:58:38 2004 ++++ smsd/Makefile Fri Feb 13 19:02:30 2004 +@@ -26,9 +26,9 @@ LDLIBS += $(PTHREAD_LIBS) \ $(shell $(GLIBLDLIBS)) --LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -ldl -+# LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -ldl +-LDLIBS += -rdynamic $(TOPDIR)/common/libgnokii.la -ldl ++# LDLIBS += -rdynamic $(TOPDIR)/common/libgnokii.la -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 diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist index 7b46d26dab28..2c8f532cbb85 100644 --- a/comms/gnokii/pkg-plist +++ b/comms/gnokii/pkg-plist @@ -19,6 +19,7 @@ include/gnokii/statemachine.h include/gnokii/virtmodem.h @dirrm include/gnokii lib/libgnokii.a +lib/libgnokii.la lib/libgnokii.so lib/libgnokii.so.1 libdata/pkgconfig/gnokii.pc @@ -28,7 +29,6 @@ sbin/mgnokiidev %%PORTDOCS%%%%DOCSDIR%%/Bugs %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/DataCalls-QuickStart -%%PORTDOCS%%%%DOCSDIR%%/gnokii.nol %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README-2110 %%PORTDOCS%%%%DOCSDIR%%/README-3810 @@ -45,6 +45,7 @@ sbin/mgnokiidev %%PORTDOCS%%%%DOCSDIR%%/gnokii-IrDA-Linux %%PORTDOCS%%%%DOCSDIR%%/gnokii-hackers-howto %%PORTDOCS%%%%DOCSDIR%%/gnokii-ir-howto +%%PORTDOCS%%%%DOCSDIR%%/gnokii.nol %%PORTDOCS%%%%DOCSDIR%%/logos.txt %%PORTDOCS%%%%DOCSDIR%%/packaging-howto %%PORTDOCS%%%%DOCSDIR%%/ringtones.txt @@ -75,13 +76,30 @@ sbin/mgnokiidev %%PORTDOCS%%@dirrm %%DOCSDIR%%/sample %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@exec mkdir -m 755 %D/%%DOCSDIR%%/sample/vCard -%%SMSD%%share/smsd/action +share/locale/cs/LC_MESSAGES/gnokii.mo +share/locale/de/LC_MESSAGES/gnokii.mo +share/locale/et/LC_MESSAGES/gnokii.mo +share/locale/fi/LC_MESSAGES/gnokii.mo +share/locale/fr/LC_MESSAGES/gnokii.mo +share/locale/it/LC_MESSAGES/gnokii.mo +share/locale/nl/LC_MESSAGES/gnokii.mo +share/locale/pl/LC_MESSAGES/gnokii.mo +share/locale/sk/LC_MESSAGES/gnokii.mo +share/locale/sl/LC_MESSAGES/gnokii.mo %%SMSD%%share/smsd/README -%%SMSD%%share/smsd/libfile.so -%%MSM%%share/smsd/libmysql.so +%%SMSD%%share/smsd/action +%%SMSD%%lib/smsd/libfile.a +%%SMSD%%lib/smsd/libfile.la +%%SMSD%%lib/smsd/libfile.so +%%MSM%%lib/smsd/libmysql.a +%%MSM%%lib/smsd/libmysql.la +%%MSM%%lib/smsd/libmysql.so %%MSM%%share/smsd/sms.tables.mysql.sql -%%PGM%%share/smsd/libpq.so +%%PGM%%lib/smsd/libpq.a +%%PGM%%lib/smsd/libpq.la +%%PGM%%lib/smsd/libpq.so %%PGM%%share/smsd/sms.tables.pq.sql +%%SMSD%%@dirrm lib/smsd %%SMSD%%@dirrm share/smsd %%X11%%share/xgnokii/help/C %%X11%%share/xgnokii/help/POSIX