Date: Wed, 20 Oct 2004 18:56:20 +0200 (CEST) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72929: [maintainer update] comms/gnokii update to 0.6.4 Message-ID: <200410201656.i9KGuKDA036071@wedge.madpilot.net> Resent-Message-ID: <200410201700.i9KH0oKN081406@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72929
>Category: ports
>Synopsis: [maintainer update] comms/gnokii update to 0.6.4
>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: Wed Oct 20 17:00:49 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 5.3-BETA7 i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 5.3-BETA7 FreeBSD 5.3-BETA7 #17: Sun Oct 3 21:30:55 CEST 2004 root@wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386
>Description:
upgrade to 0.6.4 just released. Added a knob tolink smsd to glib2.
minor changes to the messages regarding smsd in pre-fetch.
added file:
files/smsd-Makefile-WITH_GLIB.diff
>How-To-Repeat:
>Fix:
diff -ruN gnokii.old/Makefile gnokii/Makefile
--- gnokii.old/Makefile Sun Oct 17 23:45:25 2004
+++ gnokii/Makefile Wed Oct 20 18:51:07 2004
@@ -6,7 +6,7 @@
#
PORTNAME= gnokii
-PORTVERSION= 0.6.3
+PORTVERSION= 0.6.4
PORTEPOCH= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SAVANNAH} \
@@ -68,8 +68,12 @@
.else
PLIST_SUB+= PGM='@comment '
.endif
+.if defined(SMSD_WITH_GLIB2)
+USE_GNOME+= glib20
+.else
USE_GNOME+= glib12
.endif
+.endif
.if defined(WITHOUT_X11)
CONFIGURE_ARGS+= --without-x
@@ -90,6 +94,7 @@
.endif
pre-fetch:
+.if !defined(WITH_SMSD)
@${ECHO}
@${ECHO} "If you plan using the smsd daemon for automatically receiving,"
@${ECHO} "managing and sending SMSes define WITH_SMSD=yes."
@@ -98,6 +103,13 @@
@${ECHO} "will be automatically compiled in. Normal file systems support is"
@${ECHO} "always compiled in."
@${ECHO}
+.endif
+.if !defined(SMSD_WITH_GLIB2)
+ @${ECHO}
+ @${ECHO} "smsd defaults to using glib1, if you'd rather link with glib2
+ @${ECHO} "define SMSD_WITH_GLIB2=yes"
+ @${ECHO}
+.endif
post-patch:
.for f in ${FIXPREFIX}
@@ -113,6 +125,9 @@
.if ${OSVERSION} <= 500027
@${FIND} ${WRKSRC} -type f -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} \
-e 's|<stdint.h>|<inttypes.h>|'
+.endif
+.if defined(SMSD_WITH_GLIB2)
+ @cd ${WRKSRC} && ${PATCH} -s <${PATCHDIR}/smsd-Makefile-WITH_GLIB.diff
.endif
post-build:
diff -ruN gnokii.old/distinfo gnokii/distinfo
--- gnokii.old/distinfo Sun Oct 17 23:45:25 2004
+++ gnokii/distinfo Wed Oct 20 17:17:58 2004
@@ -1,2 +1,2 @@
-MD5 (gnokii-0.6.3.tar.bz2) = 7e932688aeaa2ca8be2f2e3b3bf1b90e
-SIZE (gnokii-0.6.3.tar.bz2) = 1824992
+MD5 (gnokii-0.6.4.tar.bz2) = e48e72b4038481509f32e2a7596dc2d5
+SIZE (gnokii-0.6.4.tar.bz2) = 2006834
diff -ruN gnokii.old/files/patch-smsd-Makefile gnokii/files/patch-smsd-Makefile
--- gnokii.old/files/patch-smsd-Makefile Sun Oct 17 23:45:25 2004
+++ gnokii/files/patch-smsd-Makefile Wed Oct 20 17:59:33 2004
@@ -1,5 +1,5 @@
---- smsd/Makefile.orig Fri Feb 13 18:58:38 2004
-+++ smsd/Makefile Fri Feb 13 19:02:30 2004
+--- smsd/Makefile.orig Wed Oct 20 17:24:58 2004
++++ smsd/Makefile Wed Oct 20 17:25:10 2004
@@ -26,9 +26,9 @@
LDLIBS += $(PTHREAD_LIBS) \
$(shell $(GLIBLDLIBS))
@@ -7,8 +7,8 @@
-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
+-# LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -pthread -L../getopt -lgetopt
++LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -pthread
- ifdef XPM_LIBS
- LDLIBS +=$(XPM_LIBS)
+ OBJS = smsd.lo \
+ lowlevel.lo
diff -ruN gnokii.old/files/smsd-Makefile-WITH_GLIB.diff gnokii/files/smsd-Makefile-WITH_GLIB.diff
--- gnokii.old/files/smsd-Makefile-WITH_GLIB.diff Thu Jan 1 01:00:00 1970
+++ gnokii/files/smsd-Makefile-WITH_GLIB.diff Wed Oct 20 17:26:51 2004
@@ -0,0 +1,21 @@
+--- smsd/Makefile.orig Wed Oct 20 17:26:17 2004
++++ smsd/Makefile Wed Oct 20 17:26:25 2004
+@@ -6,14 +6,14 @@
+ # $Id: Makefile,v 1.31 2004/08/03 09:29:09 ja Exp $
+ #
+
+-GLIBCFLAGS = glib-config --cflags
+-GLIBLDLIBS = glib-config --libs
++#GLIBCFLAGS = glib-config --cflags
++#GLIBLDLIBS = glib-config --libs
+
+ # Comment out above lines and uncomment below lines if you want compile smsd
+ # with glib2 instead of glib1.
+ #
+-#GLIBCFLAGS = pkg-config --cflags glib-2.0
+-#GLIBLDLIBS = pkg-config --libs glib-2.0
++GLIBCFLAGS = pkg-config --cflags glib-2.0
++GLIBLDLIBS = pkg-config --libs glib-2.0
+
+ TOPDIR=..
+ include $(TOPDIR)/Makefile.global
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410201656.i9KGuKDA036071>