Date: Fri, 9 Jan 2004 12:18:01 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61121: comms/gnokii upgrade to 0.5.8 Message-ID: <200401091118.i09BI1Y3076326@wedge.madpilot.net> Resent-Message-ID: <200401091120.i09BKKms058245@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61121
>Category: ports
>Synopsis: comms/gnokii upgrade to 0.5.8
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 09 03:20:20 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 #2: Wed Jan 7 14:56:23 CET 2004 root@wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386
>Description:
upgrade to 0.5.8. Mainly cleanup release, no removed or added files to the port.
>How-To-Repeat:
>Fix:
diff -ruN gnokii.old/Makefile gnokii/Makefile
--- gnokii.old/Makefile Thu Jan 8 14:27:37 2004
+++ gnokii/Makefile Thu Jan 8 14:30:06 2004
@@ -6,7 +6,7 @@
#
PORTNAME= gnokii
-PORTVERSION= 0.5.7
+PORTVERSION= 0.5.8
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
diff -ruN gnokii.old/distinfo gnokii/distinfo
--- gnokii.old/distinfo Thu Jan 8 14:27:37 2004
+++ gnokii/distinfo Thu Jan 8 16:32:18 2004
@@ -1 +1 @@
-MD5 (gnokii-0.5.7.tar.bz2) = e4a01db48cd05bf673e33377f145f8cf
+MD5 (gnokii-0.5.8.tar.bz2) = 04f46c4089e71cd95d4d0f2f98bcda37
diff -ruN gnokii.old/files/patch-common-Makefile gnokii/files/patch-common-Makefile
--- gnokii.old/files/patch-common-Makefile Thu Jan 8 14:27:37 2004
+++ gnokii/files/patch-common-Makefile Thu Jan 8 15:12:36 2004
@@ -1,31 +1,7 @@
---- common/Makefile.orig Sat Nov 8 12:15:34 2003
-+++ common/Makefile Wed Dec 3 21:35:14 2003
-@@ -44,13 +44,10 @@
- snprintf.o
-
- ifndef WIN32_CROSS
--ifdef NO_SHARED
--GNOKII_LIB=libgnokii.a
--else
-+GNOKII_LIBNOSHARED=libgnokii.a
- GNOKII_LIB =libgnokii.so
- GNOKII_LIBM =$(GNOKII_LIB).$(MAJOR_NUMBER)
- GNOKII_LIBMM=$(GNOKII_LIBM).$(MINOR_NUMBER)
--endif
- else
- ifdef NO_SHARED
- GNOKII_LIB=gnokii.lib
-@@ -59,7 +56,7 @@
- endif
- endif
-
--all: $(GNOKII_LIB)
-+all: $(GNOKII_LIB) $(GNOKII_LIBNOSHARED)
-
- phones/PHONES.o:
- $(MAKE) -C phones PHONES.o
-@@ -74,8 +71,7 @@
- $(CC) -o gnokii-debug $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o ../gnokii/gnokii.o
+--- 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
@@ -34,15 +10,15 @@
ln -sf $(GNOKII_LIBM) $(GNOKII_LIB)
libgnokii.a: $(OBJS) phones/PHONES.o links/LINKS.o devices/DEVICES.o
-@@ -102,11 +98,11 @@
-
- install:
+@@ -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)
-+ $(INSTALL) $(GNOKII_LIBNOSHARED) $(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
diff -ruN gnokii.old/files/patch-gnokiirc gnokii/files/patch-gnokiirc
--- gnokii.old/files/patch-gnokiirc Thu Jan 8 14:27:37 2004
+++ gnokii/files/patch-gnokiirc Thu Jan 8 15:18:10 2004
@@ -1,5 +1,5 @@
---- Docs/sample/gnokiirc.orig Tue May 20 20:31:08 2003
-+++ Docs/sample/gnokiirc Tue May 20 20:32:23 2003
+--- Docs/sample/gnokiirc.orig Thu Jan 8 15:16:55 2004
++++ Docs/sample/gnokiirc Thu Jan 8 15:17:40 2004
@@ -6,7 +6,7 @@
# Set port to the physical serial port used to connect to your phone.
diff -ruN gnokii.old/files/patch-smsd-Makefile gnokii/files/patch-smsd-Makefile
--- gnokii.old/files/patch-smsd-Makefile Thu Jan 8 14:27:37 2004
+++ gnokii/files/patch-smsd-Makefile Thu Jan 8 16:34:05 2004
@@ -1,11 +1,11 @@
---- smsd/Makefile.orig Fri Oct 10 22:38:59 2003
-+++ smsd/Makefile Fri Oct 10 22:41:33 2003
+--- 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 `glib-config --cflags`
++ $(shell $(GLIBCFLAGS)) -I$(LOCALBASE)/include
LDLIBS += $(PTHREAD_LIBS) \
$(shell $(GLIBLDLIBS))
@@ -18,33 +18,3 @@
ifdef XPM_LIBS
LDLIBS +=$(XPM_LIBS)
-@@ -41,7 +41,7 @@
-
-
- smsd: $(OBJS) $(TOPDIR)/common/libgnokii.so
-- gcc $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
-+ $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
-
-
- ### DB Modules
-@@ -50,17 +50,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 $(shell $(GLIBLDLIBS)) -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 $(shell $(GLIBLDLIBS)) $(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 $(shell $(GLIBLDLIBS))
-
- ### End of DB Modules
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401091118.i09BI1Y3076326>