Date: Fri, 14 Dec 2007 12:16:51 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/118692: [maintainer-update] upgrade comms/gnokii to 0.6.22 Message-ID: <20071214111651.61C8A130C28@megatron.madpilot.net> Resent-Message-ID: <200712141440.lBEEe1qR066618@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118692 >Category: ports >Synopsis: [maintainer-update] upgrade comms/gnokii to 0.6.22 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 14 14:40:00 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 7.0-BETA4 i386 >Organization: none >Environment: System: FreeBSD megatron.madpilot.net 7.0-BETA4 FreeBSD 7.0-BETA4 #15: Sat Dec 8 03:27:20 CET 2007 root@megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON i386 >Description: Upgrade gnokii port to latest 0.6.22 Added file: files/patch-gnokii-gnokii-utils.c >How-To-Repeat: >Fix: diff -ruN gnokii.old/Makefile gnokii/Makefile --- gnokii.old/Makefile 2007-12-14 10:41:52.000000000 +0100 +++ gnokii/Makefile 2007-12-14 11:12:26.000000000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= gnokii -PORTVERSION= 0.6.18 -PORTREVISION= 1 +PORTVERSION= 0.6.22 PORTEPOCH= 1 CATEGORIES= comms MASTER_SITES= http://www.gnokii.org/download/gnokii/ \ @@ -32,7 +31,7 @@ MAN8= gnokiid.8 mgnokiidev.8 PORTDOCS= * -INSTALL_TARGET= install-suid +INSTALL_TARGET= install-binaries install-docs install-includes PKGDEINSTALL= ${PKGINSTALL} PKGMESSAGE= ${WRKDIR}/pkg-message diff -ruN gnokii.old/distinfo gnokii/distinfo --- gnokii.old/distinfo 2007-12-14 10:41:52.000000000 +0100 +++ gnokii/distinfo 2007-12-14 10:42:11.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (gnokii-0.6.18.tar.bz2) = 0060f876414a22914ded4201335298ad -SHA256 (gnokii-0.6.18.tar.bz2) = 9b47279e0659a3c1e4bd35c48112dcbd2e4c30038bb589de1dab6f580827ada5 -SIZE (gnokii-0.6.18.tar.bz2) = 1756016 +MD5 (gnokii-0.6.22.tar.bz2) = 15d64a4911735ee30c03a7bfa9b60f05 +SHA256 (gnokii-0.6.22.tar.bz2) = 9c72fdb581bc0a3653962931592439489be7d9306cd71e94b48689545aeb7be0 +SIZE (gnokii-0.6.22.tar.bz2) = 1808129 diff -ruN gnokii.old/files/patch-Makefile.global.in gnokii/files/patch-Makefile.global.in --- gnokii.old/files/patch-Makefile.global.in 2007-12-14 10:41:52.000000000 +0100 +++ gnokii/files/patch-Makefile.global.in 2007-12-14 10:42:11.000000000 +0100 @@ -1,5 +1,5 @@ ---- Makefile.global.in.orig Thu May 10 20:50:16 2007 -+++ Makefile.global.in Thu Jun 21 23:18:13 2007 +--- Makefile.global.in.orig 2007-11-24 12:31:01.000000000 +0100 ++++ Makefile.global.in 2007-12-06 11:58:02.000000000 +0100 @@ -21,14 +21,14 @@ bindir = @bindir@ @@ -15,6 +15,6 @@ man8dir = ${mandir}/man8/ -xmandir = @XGNOKIIDIR@/man/man1/ +xmandir = ${mandir}/man1/ - docdir = ${prefix}/share/doc/${PACKAGE} - locdir = @datadir@/locale + datarootdir = @datarootdir@ + docdir = @docdir@ datadir = @datadir@ diff -ruN gnokii.old/files/patch-common-Makefile gnokii/files/patch-common-Makefile --- gnokii.old/files/patch-common-Makefile 2007-12-14 10:41:52.000000000 +0100 +++ gnokii/files/patch-common-Makefile 2007-12-14 10:42:11.000000000 +0100 @@ -1,13 +1,13 @@ ---- 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) - $(LIBTOOL) --mode=install $(INSTALL) libgnokii.la $(DESTDIR)$(libdir) +--- common/Makefile.orig 2007-11-24 12:31:01.000000000 +0100 ++++ common/Makefile 2007-12-06 12:02:39.000000000 +0100 +@@ -107,8 +107,8 @@ + @echo "done" + + install-devel: install - $(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 + @echo "done" - install-strip: install + depend dep: diff -ruN gnokii.old/files/patch-configure gnokii/files/patch-configure --- gnokii.old/files/patch-configure 2007-12-14 10:41:52.000000000 +0100 +++ gnokii/files/patch-configure 2007-12-14 10:42:11.000000000 +0100 @@ -1,6 +1,6 @@ ---- configure.orig Thu May 10 20:50:32 2007 -+++ configure Thu Jun 21 23:16:04 2007 -@@ -976,7 +976,7 @@ +--- configure.orig 2007-11-24 12:31:25.000000000 +0100 ++++ configure 2007-12-06 12:08:24.000000000 +0100 +@@ -981,7 +981,7 @@ psdir='${docdir}' libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' @@ -9,7 +9,7 @@ ac_prev= ac_dashdash= -@@ -26321,13 +26321,15 @@ +@@ -26588,13 +26588,15 @@ # First of all, check if the user has set any of the PTHREAD_LIBS, # etcetera environment variables, and if threads linking works using # them: @@ -30,7 +30,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26691,7 +26693,7 @@ +@@ -26958,7 +26960,7 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; } flag=no case "${host_cpu}-${host_os}" in @@ -39,7 +39,7 @@ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; esac { echo "$as_me:$LINENO: result: ${flag}" >&5 -@@ -27495,7 +27497,7 @@ +@@ -27762,7 +27764,7 @@ if test "$enable_libical" == "yes"; then OLD_CFLAGS="$CFLAGS" @@ -48,12 +48,12 @@ CFLAGS="$CFLAGS $ICAL_CFLAGS" { echo "$as_me:$LINENO: checking whether libical is installed" >&5 echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; } -@@ -29039,7 +29041,7 @@ - { echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&5 +@@ -29577,7 +29579,7 @@ echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; } if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then -- XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11" -+ XPM_CFLAGS="$XINCL" XPM_LIBS="-L$x_libraries -lXpm -lX11 -lroken -lcrypt" + XPM_CFLAGS="$XINCL" +- XPM_LIBS="$XLIBS -lXpm -lX11" ++ XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt" cat >>confdefs.h <<\_ACEOF #define XPM 1 _ACEOF diff -ruN gnokii.old/files/patch-gnokii-gnokii-utils.c gnokii/files/patch-gnokii-gnokii-utils.c --- gnokii.old/files/patch-gnokii-gnokii-utils.c 1970-01-01 01:00:00.000000000 +0100 +++ gnokii/files/patch-gnokii-gnokii-utils.c 2007-12-14 10:42:11.000000000 +0100 @@ -0,0 +1,11 @@ +--- gnokii/gnokii-utils.c.orig 2007-12-06 14:24:37.000000000 +0100 ++++ gnokii/gnokii-utils.c 2007-12-06 14:25:25.000000000 +0100 +@@ -43,6 +43,8 @@ + + #include <stdio.h> + #include <signal.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #include "gnokii-app.h" + #include "gnokii.h" diff -ruN gnokii.old/pkg-plist gnokii/pkg-plist --- gnokii.old/pkg-plist 2007-12-14 10:41:52.000000000 +0100 +++ gnokii/pkg-plist 2007-12-14 12:08:05.000000000 +0100 @@ -20,7 +20,7 @@ lib/libgnokii.a lib/libgnokii.la lib/libgnokii.so -lib/libgnokii.so.6 +lib/libgnokii.so.9 libdata/pkgconfig/gnokii.pc libdata/pkgconfig/xgnokii.pc sbin/gnokiid @@ -53,6 +53,7 @@ %%PGM%%share/smsd/sms.tables.pq.sql %%SMSD%%@dirrm lib/smsd %%SMSD%%@dirrm share/smsd +%%X11%%share/applications/xgnokii.desktop %%X11%%share/xgnokii/help/C %%X11%%share/xgnokii/help/POSIX %%X11%%share/xgnokii/help/en_US/COPYING @@ -129,6 +130,15 @@ %%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/cables %%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/irda %%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/calendar +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/contacts +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/dtmf +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/main +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/netmon +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/sms +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/speeddial +%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/xkeyb +%%X11%%@exec mkdir -p %D/share/doc/gnokii/sample/vCard %%X11%%@dirrm share/xgnokii/help/en_US/cables %%X11%%@dirrm share/xgnokii/help/en_US/calendar %%X11%%@dirrm share/xgnokii/help/en_US/contacts >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071214111651.61C8A130C28>