Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Mar 2005 13:51:32 +0300 (MSK)
From:      Kirill <kirill@solaris.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/79189: fixed patch (supersedes ports/79187)
Message-ID:  <200503241051.j2OApWQl096555@mpool.solaris.ru>
Resent-Message-ID: <200503241100.j2OB0AeU069086@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         79189
>Category:       ports
>Synopsis:       fixed patch (supersedes ports/79187)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 24 11:00:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Kirill Bezzubets
>Release:        FreeBSD 5.3-STABLE
>Organization:
>Environment:


>Description:

ports/79187 contains buggy patch

>How-To-Repeat:

>Fix:

diff -ur gammu-098/Makefile gammu/Makefile
--- gammu-098/Makefile	Wed Mar  2 12:55:16 2005
+++ gammu/Makefile	Thu Mar 24 13:45:38 2005
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gammu
-PORTVERSION=	0.98.0
+PORTVERSION=	1.00.0
 PORTREVISION=	1
 CATEGORIES=	comms
-MASTER_SITES=	http://www.mwiacek.com/zips/gsm/gammu/older/ \
-		http://www.kirill.spb.ru/gammu/
+MASTER_SITES=	http://www.kirill.spb.ru/gammu/
 
 MAINTAINER=	kirill@solaris.ru
 COMMENT=	GNU All Mobile Management Utilities
@@ -19,7 +18,7 @@
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
-WANT_AUTOCONF_VER=253
+WANT_AUTOCONF_VER=259
 
 CONFIGURE_ARGS=	--disable-bluerfsearch
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fPIC"
diff -ur gammu-098/distinfo gammu/distinfo
--- gammu-098/distinfo	Fri Jan 21 14:44:29 2005
+++ gammu/distinfo	Thu Mar 24 13:45:38 2005
@@ -1,2 +1,2 @@
-MD5 (gammu-0.98.0.tar.gz) = 6abfb95af979ce283fb22a179476dc6a
-SIZE (gammu-0.98.0.tar.gz) = 813856
+MD5 (gammu-1.00.0.tar.gz) = 9d921f9c5b6f3b8b76a69720e2d9f173
+SIZE (gammu-1.00.0.tar.gz) = 850872
diff -ur gammu-098/files/patch-cfg-Makefile.glo gammu/files/patch-cfg-Makefile.glo
--- gammu-098/files/patch-cfg-Makefile.glo	Wed Mar  2 12:55:17 2005
+++ gammu/files/patch-cfg-Makefile.glo	Thu Mar 24 13:45:31 2005
@@ -1,15 +1,15 @@
---- cfg/Makefile.glo.orig	Mon Jul 26 04:01:32 2004
-+++ cfg/Makefile.glo	Wed Mar  2 10:42:01 2005
-@@ -102,7 +102,7 @@
+--- cfg/Makefile.glo.orig	Sat Jan 15 17:01:28 2005
++++ cfg/Makefile.glo	Thu Mar 24 13:13:31 2005
+@@ -122,7 +122,7 @@
  	@echo Making $<
- 	@$(CC) -c $(CFLAGS) -I$(TOPDIR)/common/ $(CPPFLAGS) $(<) -o $(@)
-     
+ 	@$(CC) -c $(CFLAGS) -I$(TOPDIR)/common/ $(CPPFLAGS) $*.c -o $*.o
+ 
 -all: gammu
 +all: gammu shared
  
  $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
  	@echo Linking gammu
-@@ -203,7 +203,7 @@
+@@ -227,7 +227,7 @@
  	@$(INSTALL) -m 0644 $(TOPDIR)/docs/docs/english/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)
  	@$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/english/gammu.1
   
@@ -18,7 +18,7 @@
  
  installonly: all
  	@echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -220,8 +220,7 @@
+@@ -244,8 +244,7 @@
  
  	@echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
  	@$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
@@ -28,7 +28,7 @@
  	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so
   
  	@echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)
-@@ -240,8 +239,8 @@
+@@ -264,8 +263,8 @@
  	@$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h
  
  	@echo Installing pkgconfig file
Only in gammu-098/files: patch-common-device-serial-ser_unx.c
diff -ur gammu-098/files/patch-configure.in gammu/files/patch-configure.in
--- gammu-098/files/patch-configure.in	Thu Mar 24 12:58:19 2005
+++ gammu/files/patch-configure.in	Thu Mar 24 13:45:31 2005
@@ -11,7 +11,6 @@
                   LDLIBS="$LDLIBS -lbluetooth"
                   AC_CHECK_LIB(sdp, sdp_list_append, LDLIBS="$LDLIBS -lsdp")
                   AC_DEFINE(GSM_ENABLE_BLUEZ)
-
 @@ -261,7 +261,7 @@
          [  --disable-bluefbus      Disable Nokia FBUS2 over Bluetooth stack
                            (Nokia 6210)],
Only in gammu-098/files: patch-configure.in~
diff -ur gammu-098/pkg-plist gammu/pkg-plist
--- gammu-098/pkg-plist	Thu Mar 24 11:17:44 2005
+++ gammu/pkg-plist	Thu Mar 24 13:45:38 2005
@@ -6,18 +6,18 @@
 %%DOCSDIR%%/docs/english/replace.txt
 %%DOCSDIR%%/docs/italian/gammu.txt
 %%DOCSDIR%%/docs/italian/readme.txt
-%%DOCSDIR%%/examples/gammu.png
+%%DOCSDIR%%/docs/gammu.png
 %%DOCSDIR%%/examples/config/gammurc
-%%DOCSDIR%%/examples/config/smsd_mysql.sql
 %%DOCSDIR%%/examples/config/smsdrc
+%%DOCSDIR%%/examples/config/mysql.sql
 %%DOCSDIR%%/examples/fax/faxreceive
 %%DOCSDIR%%/examples/fax/faxsend
-%%DOCSDIR%%/examples/logo/greatings.nlm
 %%DOCSDIR%%/examples/ppp/data
 %%DOCSDIR%%/examples/ppp/gprs
 %%DOCSDIR%%/examples/ppp/startppp
 %%DOCSDIR%%/examples/ppp/statsppp
-%%DOCSDIR%%/examples/ring/axelf.txt
+%%DOCSDIR%%/examples/media/aliens.nlm
+%%DOCSDIR%%/examples/media/axelf.txt
 share/gammu/gammu_cs.txt
 share/gammu/gammu_de.txt
 share/gammu/gammu_it.txt
@@ -57,6 +57,7 @@
 include/gammu/phone/nokia/nfuncold.h
 include/gammu/phone/nokia/dct3/dct3comm.h
 include/gammu/phone/nokia/dct3/dct3func.h
+include/gammu/phone/nokia/dct3/n0650.h
 include/gammu/phone/nokia/dct3/n6110.h
 include/gammu/phone/nokia/dct3/n7110.h
 include/gammu/phone/nokia/dct3/n9210.h
@@ -64,6 +65,8 @@
 include/gammu/phone/nokia/dct4/n3320.h
 include/gammu/phone/nokia/dct4/n3650.h
 include/gammu/phone/nokia/dct4/n6510.h
+include/gammu/phone/nokia/dct4/6510cal.h
+include/gammu/phone/nokia/dct4/6510file.h
 include/gammu/phone/obex/obexgen.h
 include/gammu/phone/symbian/mroutgen.h
 include/gammu/protocol/protocol.h
@@ -123,9 +126,8 @@
 @dirrm %%DOCSDIR%%/docs/italian
 @dirrm %%DOCSDIR%%/docs
 @dirrm %%DOCSDIR%%/examples/config
+@dirrm %%DOCSDIR%%/examples/media
 @dirrm %%DOCSDIR%%/examples/ppp
-@dirrm %%DOCSDIR%%/examples/ring
-@dirrm %%DOCSDIR%%/examples/logo
 @dirrm %%DOCSDIR%%/examples/fax
 @dirrm %%DOCSDIR%%/examples
 @dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503241051.j2OApWQl096555>