From david@da-quirk.org  Sun Nov  7 22:46:05 2004
Return-Path: <david@da-quirk.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 265B316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Nov 2004 22:46:05 +0000 (GMT)
Received: from da-quirk.org (da-quirk.org [81.57.235.55])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 663E143D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Nov 2004 22:46:04 +0000 (GMT)
	(envelope-from david@da-quirk.org)
Received: from da-quirk.org (localhost [127.0.0.1])
	by da-quirk.org (8.12.10/8.12.10) with ESMTP id iA7Mk9C2089290
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 7 Nov 2004 23:46:09 +0100 (CET)
	(envelope-from david@da-quirk.org)
Received: (from david@localhost)
	by da-quirk.org (8.12.10/8.12.10/Submit) id iA7Mk9ZY089288;
	Sun, 7 Nov 2004 23:46:09 +0100 (CET)
	(envelope-from david)
Message-Id: <200411072246.iA7Mk9ZY089288@da-quirk.org>
Date: Sun, 7 Nov 2004 23:46:09 +0100 (CET)
From: David Le Brun <david@dyn-ns.net>
Reply-To: David Le Brun <david@dyn-ns.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer Update] audio/gtkpod : fix sync-* scripts
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73652
>Category:       ports
>Synopsis:       [Maintainer Update] audio/gtkpod : fix sync-* scripts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ahze
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 07 22:50:13 GMT 2004
>Closed-Date:    Mon Nov 08 03:52:51 GMT 2004
>Last-Modified:  Mon Nov 08 03:52:51 GMT 2004
>Originator:     David Le Brun
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD da-quirk.org 5.2-RELEASE FreeBSD 5.2-RELEASE #4: Sat Jan 17 16:34:59 CET 2004 root@da-quirk.org:/usr/src/sys/i386/compile/PAPRIKA i386


	
>Description:
gtkpod is bundled with (the scripts to sync one's addressbook and calendar). 
Their hash-bang line is "#!/bin/bash" which obviously doesn't work on FreeBSD.
This problem was pointed out by Julian C. Dunn

Changes :
- Substitute line /bin/bash to /bin/sh
- Removed old knob FAAD unused

>How-To-Repeat:
	
>Fix:

	

--- gtkpod.diff begins here ---
diff -ruN gtkpod.old/Makefile gtkpod/Makefile
--- gtkpod.old/Makefile	Mon Aug 16 22:17:10 2004
+++ gtkpod/Makefile	Sun Nov  7 23:28:47 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkpod
 PORTVERSION=	0.80
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,7 +39,7 @@
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
-.if !defined(WITH_AAC) && !defined(WITH_FAAD)
+.if !defined(WITH_AAC)
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To enable AAC support with mpeg4ip define the WITH_AAC knob."
@@ -52,6 +52,10 @@
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|(libdir)/locale|(datadir)/locale|' \
 		${WRKSRC}/po/Makefile.in.in
+	@${REINPLACE_CMD} -e 's|bin/bash|bin/sh|' \
+		${WRKSRC}/scripts/sync-kaddressbook.sh
+	@${REINPLACE_CMD} -e 's|bin/bash|bin/sh|' \
+		${WRKSRC}/scripts/sync-korganizer.sh
 
 post-install:
 .if !defined(NOPORTDOCS)
--- gtkpod.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ahze  
Responsible-Changed-By: ahze 
Responsible-Changed-When: Sun Nov 7 22:53:04 GMT 2004 
Responsible-Changed-Why:  
Grab 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73652 
State-Changed-From-To: open->closed  
State-Changed-By: ahze 
State-Changed-When: Mon Nov 8 03:52:38 GMT 2004 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=73652 
>Unformatted:
