diff options
author | sergei <sergei@FreeBSD.org> | 2004-01-09 23:57:18 +0800 |
---|---|---|
committer | sergei <sergei@FreeBSD.org> | 2004-01-09 23:57:18 +0800 |
commit | f843df2db951236c3c5f723f85c077706f1dbe84 (patch) | |
tree | 0ae812cf614f909bba286df272b842ba0e5e68cf /comms/gnokii | |
parent | b84a7d2eeaeb0f8421bc8bd16b62fa1753c06e6f (diff) | |
download | freebsd-ports-gnome-f843df2db951236c3c5f723f85c077706f1dbe84.tar.gz freebsd-ports-gnome-f843df2db951236c3c5f723f85c077706f1dbe84.tar.zst freebsd-ports-gnome-f843df2db951236c3c5f723f85c077706f1dbe84.zip |
- Update to 0.5.8 [1]
- Fix pkg-plist: .mo files do not seem to get installed
PR: 61121 [1]
Submitted by: Guido Falsi <mad@madpilot.net>
Diffstat (limited to 'comms/gnokii')
-rw-r--r-- | comms/gnokii/Makefile | 2 | ||||
-rw-r--r-- | comms/gnokii/distinfo | 2 | ||||
-rw-r--r-- | comms/gnokii/files/patch-common-Makefile | 40 | ||||
-rw-r--r-- | comms/gnokii/files/patch-gnokiirc | 4 | ||||
-rw-r--r-- | comms/gnokii/files/patch-smsd-Makefile | 36 | ||||
-rw-r--r-- | comms/gnokii/pkg-plist | 10 |
6 files changed, 15 insertions, 79 deletions
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 9c4436e11096..e8fa99f57fcb 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnokii -PORTVERSION= 0.5.7 +PORTVERSION= 0.5.8 PORTEPOCH= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ diff --git a/comms/gnokii/distinfo b/comms/gnokii/distinfo index a0fa8dda4d08..82d7c4da3f60 100644 --- a/comms/gnokii/distinfo +++ b/comms/gnokii/distinfo @@ -1 +1 @@ -MD5 (gnokii-0.5.7.tar.bz2) = e4a01db48cd05bf673e33377f145f8cf +MD5 (gnokii-0.5.8.tar.bz2) = 04f46c4089e71cd95d4d0f2f98bcda37 diff --git a/comms/gnokii/files/patch-common-Makefile b/comms/gnokii/files/patch-common-Makefile index cb3429e49f99..00c0c733f254 100644 --- a/comms/gnokii/files/patch-common-Makefile +++ b/comms/gnokii/files/patch-common-Makefile @@ -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 --git a/comms/gnokii/files/patch-gnokiirc b/comms/gnokii/files/patch-gnokiirc index 0f38b9603175..14fda694b287 100644 --- a/comms/gnokii/files/patch-gnokiirc +++ b/comms/gnokii/files/patch-gnokiirc @@ -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 --git a/comms/gnokii/files/patch-smsd-Makefile b/comms/gnokii/files/patch-smsd-Makefile index 6972f77a5f89..1f4f74924d4b 100644 --- a/comms/gnokii/files/patch-smsd-Makefile +++ b/comms/gnokii/files/patch-smsd-Makefile @@ -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 diff --git a/comms/gnokii/pkg-plist b/comms/gnokii/pkg-plist index 2ab006fd32d1..7b46d26dab28 100644 --- a/comms/gnokii/pkg-plist +++ b/comms/gnokii/pkg-plist @@ -75,16 +75,6 @@ sbin/mgnokiidev %%PORTDOCS%%@dirrm %%DOCSDIR%%/sample %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@exec mkdir -m 755 %D/%%DOCSDIR%%/sample/vCard -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/action %%SMSD%%share/smsd/README %%SMSD%%share/smsd/libfile.so |