From tijl@kalimero.kotnet.org  Tue Mar 23 11:48:19 2004
Return-Path: <tijl@kalimero.kotnet.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B90016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 11:48:19 -0800 (PST)
Received: from nibbel.kulnet.kuleuven.ac.be (nibbel.kulnet.kuleuven.ac.be [134.58.240.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 87EA643D45
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 11:48:18 -0800 (PST)
	(envelope-from tijl@kalimero.kotnet.org)
Received: from localhost (localhost [127.0.0.1])
	by nibbel.kulnet.kuleuven.ac.be (Postfix) with ESMTP id E7BB64BD3E
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 20:48:14 +0100 (CET)
Received: from antonius.kulnet.kuleuven.ac.be (antonius.kulnet.kuleuven.ac.be [134.58.240.73])
	by nibbel.kulnet.kuleuven.ac.be (Postfix) with ESMTP id 71FA24C59B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 20:48:14 +0100 (CET)
Received: from kalimero.kotnet.org (kalimero.kotnet.org [10.4.40.235])
	by antonius.kulnet.kuleuven.ac.be (Postfix) with ESMTP id CCD6D4C0D1
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 20:48:13 +0100 (CET)
Received: from kalimero.kotnet.org (localhost [127.0.0.1])
	by kalimero.kotnet.org (8.12.11/8.12.11) with ESMTP id i2NJmCZr029477
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 20:48:12 +0100 (CET)
	(envelope-from tijl@kalimero.kotnet.org)
Received: (from tijl@localhost)
	by kalimero.kotnet.org (8.12.11/8.12.11/Submit) id i2NJmBge029476;
	Tue, 23 Mar 2004 20:48:11 +0100 (CET)
	(envelope-from tijl)
Message-Id: <200403231948.i2NJmBge029476@kalimero.kotnet.org>
Date: Tue, 23 Mar 2004 20:48:11 +0100 (CET)
From: Tijl Coosemans <tijl@ulyssis.org>
Reply-To: Tijl Coosemans <tijl@ulyssis.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [update] devel/libticalcs: fix broken build
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64631
>Category:       ports
>Synopsis:       [update] devel/libticalcs: fix broken build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 23 11:50:02 PST 2004
>Closed-Date:    Wed Mar 24 15:21:12 PST 2004
>Last-Modified:  Wed Mar 24 15:21:12 PST 2004
>Originator:     Tijl Coosemans
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD kalimero.kotnet.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Mar 1 17:42:40 CET 2004 root@kalimero.kotnet.org:/usr/obj/usr/src/sys/TIJL i386


	
>Description:
Recent changes to the port regarding its dependency on automake
(http://lists.freebsd.org/pipermail/freebsd-ports/2004-March/010330.html)
broke it. This dependency was quite a hack actually, which is why it broke,
so I got rid of it all now.
>How-To-Repeat:
	
>Fix:

"files/patch-macros-Makefile.in" can be deleted.

--- patch begins here ---
diff -urN libticalcs.orig/Makefile libticalcs/Makefile
--- libticalcs.orig/Makefile	Tue Mar 23 17:17:12 2004
+++ libticalcs/Makefile	Tue Mar 23 17:19:05 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	libticalcs
 PORTVERSION=	4.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -22,7 +22,6 @@
 
 USE_GETTEXT=	yes
 USE_GNOME=	glib20
-USE_AUTOMAKE_VER=	15
 GNU_CONFIGURE=	yes
 USE_LIBTOOL_VER=	13
 USE_GMAKE=	yes
diff -urN libticalcs.orig/files/patch-configure libticalcs/files/patch-configure
--- libticalcs.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ libticalcs/files/patch-configure	Tue Mar 23 17:20:13 2004
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Mar 23 17:19:45 2004
++++ configure	Tue Mar 23 17:20:06 2004
+@@ -1946,6 +1946,7 @@
+     ACLOCALDIR=`aclocal --print-ac-dir`
+ 
+ fi
++ACLOCALDIR=""
+ 
+ 
+ if test x$ACLOCALDIR != x ; then
diff -urN libticalcs.orig/files/patch-macros-Makefile.in libticalcs/files/patch-macros-Makefile.in
--- libticalcs.orig/files/patch-macros-Makefile.in	Tue Mar 23 17:17:12 2004
+++ libticalcs/files/patch-macros-Makefile.in	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- macros/Makefile.in.orig	Sat Sep 20 13:34:57 2003
-+++ macros/Makefile.in	Sat Sep 20 13:35:18 2003
-@@ -194,7 +194,7 @@
-         done
- 
- 
--aclocaldir = @ACLOCALDIR@
-+aclocaldir = ${datadir}/aclocal
- 
- @Aclocal_TRUE@aclocal_DATA = ticalcs.m4
- subdir = macros
diff -urN libticalcs.orig/pkg-plist libticalcs/pkg-plist
--- libticalcs.orig/pkg-plist	Tue Mar 23 17:17:12 2004
+++ libticalcs/pkg-plist	Tue Mar 23 17:17:40 2004
@@ -16,6 +16,5 @@
 lib/libticalcs-4.so
 lib/libticalcs-4.so.5
 libdata/pkgconfig/ticalcs-4.pc
-share/aclocal/ticalcs.m4
 share/locale/fr/LC_MESSAGES/libticalcs.mo
 @unexec rmdir %D/include/tilp 2>/dev/null || true
--- patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Mar 24 15:21:04 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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