From mdewilde@mdw.elis.rug.ac.be  Wed Oct 31 06:49:52 2001
Return-Path: <mdewilde@mdw.elis.rug.ac.be>
Received: from mdw.elis.rug.ac.be (mdw.elis.rug.ac.be [157.193.67.161])
	by hub.freebsd.org (Postfix) with SMTP id 9023137B403
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 31 Oct 2001 06:49:51 -0800 (PST)
Received: (qmail 40041 invoked by uid 1000); 31 Oct 2001 14:49:50 -0000
Message-Id: <20011031144950.40040.qmail@mdw.elis.rug.ac.be>
Date: 31 Oct 2001 14:49:50 -0000
From: Michiel De Wilde <michiel.dewilde@rug.ac.be>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Unbreak port: x11-wm/mosfet-liquid
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         31662
>Category:       ports
>Synopsis:       Unbreak port: x11-wm/mosfet-liquid
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 31 06:50:01 PST 2001
>Closed-Date:    Tue Nov 6 06:47:11 PST 2001
>Last-Modified:  Tue Nov 06 06:47:24 PST 2001
>Originator:     Michiel De Wilde
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
Ghent University
>Environment:
System: FreeBSD mdw.elis.rug.ac.be 4.4-STABLE FreeBSD 4.4-STABLE #0: Thu Oct 25 14:11:14 CEST 2001 root@mdw.elis.rug.ac.be:/usr/src/sys/compile/mdw.elis.rug.ac.be i386


	
>Description:
Recent update of devel/automake to 1.5 breaks x11-wm/mosfet-liquid. Below is the patch to liquid that solves the problem.
>How-To-Repeat:
	
>Fix:
patch -p0 < patchfile # from inside the mosfet-liquid directory

* the "-p0" is required
* I don't think PORTREVISION needs incrementing (because the resulting installalled binaries remain identical; nobody needs to rebuild). You can increment it if you feel like it, of course.

diff -Pur Makefile.orig Makefile
--- Makefile.orig	Wed Oct 31 15:21:12 2001
+++ Makefile	Wed Oct 31 15:02:11 2001
@@ -13,7 +13,7 @@
 
 MAINTAINER=	Michiel De Wilde <michiel.dewilde@rug.ac.be>
 
-BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
 		autoconf:${PORTSDIR}/devel/autoconf
 
 GNU_CONFIGURE=	yes
diff -Pur files/patch-aa.orig files/patch-aa
--- files/patch-aa.orig	Thu Jan  1 01:00:00 1970
+++ files/patch-aa	Wed Oct 31 15:18:53 2001
@@ -0,0 +1,28 @@
+--- admin/Makefile.common.orig	Wed Oct 31 15:17:47 2001
++++ admin/Makefile.common	Wed Oct 31 15:18:24 2001
+@@ -13,11 +13,11 @@
+ 	  $(MAKE) -f Makefile.am top_srcdir=. configure.in ;\
+ 	fi
+ 	@echo "*** Retrieving configure tests needed by configure.in"
+-	@aclocal
++	@aclocal14
+ 	@echo "*** Scanning for include statements"
+ 	@autoheader
+ 	@echo "*** Building Makefile templates"
+-	@automake
++	@automake14
+ 	@echo "*** Scanning for moc files and kde tags"
+ 	@perl admin/am_edit
+ 	@echo "*** Building configure"
+@@ -48,9 +48,9 @@
+ 	@if test -r configure.in.in; then \
+ 	  $(MAKE) -f Makefile.am top_srcdir=. subdirs configure.in; \
+ 	fi ;\
+-	aclocal; \
++	aclocal14; \
+ 	autoheader; \
+-	automake --foreign --include-deps; \
++	automake14 --foreign --include-deps; \
+ 	perl admin/am_edit; \
+ 	autoconf; \
+ 	if test -r configure.in.in ; then \
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Tue Nov 6 06:47:11 PST 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31662 
>Unformatted:
