Date: Fri, 13 Feb 2004 19:34:35 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62800: Gnokii port update to version 0.5.10 Message-ID: <200402131834.i1DIYZ83008663@wedge.madpilot.net> Resent-Message-ID: <200402131840.i1DIeDk0091986@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62800
>Category: ports
>Synopsis: Gnokii port update to version 0.5.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 13 10:40:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 5.2-CURRENT FreeBSD 5.2-CURRENT #8: Fri Feb 6 20:10:06 CET 2004 root@wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386
>Description:
Upgrading the gnokii port to 0.5.10, also a few cosmetic changes,
changed the description due to request from author.
I also could volounteer for maintainership of the port, since I'm
the only one updating it and been contacted by the author. What
should I do to do this?
removed files:
files/patch-common-Makefile
files/patch-po-Makefile.in.in
>How-To-Repeat:
>Fix:
diff -ruN gnokii.old/Makefile gnokii/Makefile
--- gnokii.old/Makefile Sun Feb 8 15:52:35 2004
+++ gnokii/Makefile Fri Feb 13 17:52:48 2004
@@ -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
+COMMENT= Tools to talk to GSM cellular phones
USE_REINPLACE= yes
USE_GETTEXT= yes
@@ -107,12 +106,12 @@
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 +127,14 @@
${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 -ruN gnokii.old/distinfo gnokii/distinfo
--- gnokii.old/distinfo Sun Feb 8 15:52:35 2004
+++ gnokii/distinfo Sun Feb 8 15:55:34 2004
@@ -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 -ruN gnokii.old/files/patch-common-Makefile gnokii/files/patch-common-Makefile
--- gnokii.old/files/patch-common-Makefile Sun Feb 8 15:52:35 2004
+++ gnokii/files/patch-common-Makefile Thu Jan 1 01:00:00 1970
@@ -1,28 +0,0 @@
---- 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 @@
- $(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
-- $(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
-
- install-strip: install
diff -ruN gnokii.old/files/patch-po-Makefile.in.in gnokii/files/patch-po-Makefile.in.in
--- gnokii.old/files/patch-po-Makefile.in.in Sun Feb 8 15:52:35 2004
+++ gnokii/files/patch-po-Makefile.in.in Thu Jan 1 01:00:00 1970
@@ -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 -ruN gnokii.old/files/patch-smsd-Makefile gnokii/files/patch-smsd-Makefile
--- gnokii.old/files/patch-smsd-Makefile Sun Feb 8 15:52:35 2004
+++ gnokii/files/patch-smsd-Makefile Fri Feb 13 19:02:40 2004
@@ -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 -ruN gnokii.old/pkg-plist gnokii/pkg-plist
--- gnokii.old/pkg-plist Sun Feb 8 15:52:35 2004
+++ gnokii/pkg-plist Fri Feb 13 19:19:06 2004
@@ -19,16 +19,16 @@
include/gnokii/virtmodem.h
@dirrm include/gnokii
lib/libgnokii.a
+lib/libgnokii.la
lib/libgnokii.so
lib/libgnokii.so.1
-libdata/pkgconfig/gnokii.pc
+lib/pkgconfig/gnokii.pc
sbin/gnokiid
sbin/mgnokiidev
%%SMSD%%sbin/smsd
%%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 @@
%%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,12 +76,24 @@
%%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
+share/nls/POSIX
+share/nls/en_US.US-ASCII
%%SMSD%%share/smsd/README
-%%SMSD%%share/smsd/libfile.so
-%%MSM%%share/smsd/libmysql.so
+%%SMSD%%share/smsd/action
+%%SMSD%%lib/smsd/libfile.la
+%%MSM%%lib/smsd/libmysql.la
%%MSM%%share/smsd/sms.tables.mysql.sql
-%%PGM%%share/smsd/libpq.so
+%%PGM%%lib/smsd/libpq.la
%%PGM%%share/smsd/sms.tables.pq.sql
%%SMSD%%@dirrm share/smsd
%%X11%%share/xgnokii/help/C
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402131834.i1DIYZ83008663>