From frank@dynamical-systems.org  Wed Mar  1 08:49:25 2006
Return-Path: <frank@dynamical-systems.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4A69B16A420
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Mar 2006 08:49:25 +0000 (GMT)
	(envelope-from frank@dynamical-systems.org)
Received: from mout2.freenet.de (mout2.freenet.de [194.97.50.155])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A705D43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  1 Mar 2006 08:49:24 +0000 (GMT)
	(envelope-from frank@dynamical-systems.org)
Received: from [194.97.55.242] (helo=mx9.freenet.de)
	by mout2.freenet.de with esmtpa (Exim 4.61)
	(envelope-from <frank@dynamical-systems.org>)
	id 1FEN1P-0004YB-Jq
	for FreeBSD-gnats-submit@freebsd.org; Wed, 01 Mar 2006 09:49:23 +0100
Received: from p508eaad6.dip0.t-ipconnect.de ([80.142.170.214] helo=pollux.senax.net)
	by mx9.freenet.de with esmtpsa (ID jr-relay@freenet.de) (TLSv1:AES256-SHA:256) (Exim 4.61 #60)
	id 1FEN1P-0002x3-9l
	for FreeBSD-gnats-submit@freebsd.org; Wed, 01 Mar 2006 09:49:23 +0100
Received: from pollux.senax.net (localhost.senax.net [127.0.0.1])
	by pollux.senax.net (8.13.5/8.13.5) with ESMTP id k218nLhN001079;
	Wed, 1 Mar 2006 09:49:21 +0100 (CET)
	(envelope-from frank@dynamical-systems.org)
Received: (from root@localhost)
	by pollux.senax.net (8.13.5/8.13.5/Submit) id k218nLAM001078;
	Wed, 1 Mar 2006 09:49:21 +0100 (CET)
	(envelope-from frank@dynamical-systems.org)
Message-Id: <200603010849.k218nLAM001078@pollux.senax.net>
Date: Wed, 1 Mar 2006 09:49:21 +0100 (CET)
From: "Frank W. Josellis" <frank@dynamical-systems.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: astro/xmoontool to 3.0.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         93972
>Category:       ports
>Synopsis:       Update port: astro/xmoontool to 3.0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    thierry
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 01 08:50:03 GMT 2006
>Closed-Date:    Fri Mar 24 10:05:35 GMT 2006
>Last-Modified:  Fri Mar 24 10:10:15 GMT 2006
>Originator:     Frank W. Josellis
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD pollux.senax.net 5.4-STABLE FreeBSD 5.4-STABLE #4: Thu Jan 26 16:06:41 CET 2006 root@pollux.senax.net:/usr/obj/usr/src/sys/POLLUX i386

>Description:
Regular update to version 3.0.3. The optional libnova support is enabled
by default where possible, i.e., for FreeBSD 5.3 and later.

>How-To-Repeat:
	
>Fix:

--- xmoontool-3.0.3.patch begins here ---
diff -Nur xmoontool.BAK/Makefile xmoontool/Makefile
--- xmoontool.BAK/Makefile	Thu Feb  2 15:15:43 2006
+++ xmoontool/Makefile	Wed Mar  1 00:29:16 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmoontool
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.3
 CATEGORIES=	astro
 MASTER_SITES=	http://www.senax.net/xmoontool/
 
@@ -26,6 +26,18 @@
 pre-configure:
 .if !defined(WITHOUT_DEFAULT_COLOR)
 	@${ECHO_MSG} "For use with monochrome displays try to set WITHOUT_DEFAULT_COLOR"
+.endif
+
+.if ${OSVERSION} < 503000	# libnova currently not available here!
+WITHOUT_LIBNOVA=	yes
+.elif !defined(WITHOUT_LIBNOVA)
+	@${ECHO_MSG} "You can disable libnova support by defining WITHOUT_LIBNOVA"
+.endif
+
+.if defined(WITHOUT_LIBNOVA)
+MAKE_ENV+=	WITHOUT_LIBNOVA=yes
+.else
+LIB_DEPENDS+=	nova:${PORTSDIR}/astro/libnova
 .endif
 
 do-configure:
diff -Nur xmoontool.BAK/distinfo xmoontool/distinfo
--- xmoontool.BAK/distinfo	Thu Feb  2 15:15:43 2006
+++ xmoontool/distinfo	Wed Mar  1 00:29:16 2006
@@ -1,3 +1,3 @@
-MD5 (xmoontool-3.0.2.tar.gz) = 5556d08574f25a6098858343b702d343
-SHA256 (xmoontool-3.0.2.tar.gz) = eb5eeb4da988e62dfadcbf7189e072cb9c83b62e005130e84621a5ad487b2c8b
-SIZE (xmoontool-3.0.2.tar.gz) = 20394
+MD5 (xmoontool-3.0.3.tar.gz) = 1688d1176d197c1c4f28711e410a28e3
+SHA256 (xmoontool-3.0.3.tar.gz) = eda8312eedf86116e2b8289ce7c7e3e93ea45f621b1c13a187aa2d3885704d32
+SIZE (xmoontool-3.0.3.tar.gz) = 24354
--- xmoontool-3.0.3.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: thierry 
State-Changed-When: Wed Mar 22 21:50:17 UTC 2006 
State-Changed-Why:  

This port does not respect CFLAGS, CC nor PREFIX; what about the 
following patch? (Since I'm there, reorganize Makefile) 

--- xmoontool.diff begins here --- 
diff -urN astro/xmoontool.orig/Makefile astro/xmoontool/Makefile 
--- astro/xmoontool.orig/Makefile	Tue Jan 31 20:44:26 2006 
+++ astro/xmoontool/Makefile	Wed Mar 22 22:33:50 2006 
@@ -6,14 +6,13 @@ 
# 

PORTNAME=	xmoontool 
-PORTVERSION=	3.0.2 
+PORTVERSION=	3.0.3 
CATEGORIES=	astro 
MASTER_SITES=	http://www.senax.net/xmoontool/ 

MAINTAINER=	frank@dynamical-systems.org 
COMMENT=	A version of John Walker's classical moontool for X11/Motif 

-USE_REINPLACE=	yes 
USE_MOTIF=	yes 
USE_X_PREFIX=	yes 

@@ -22,6 +21,21 @@ 
PLIST_FILES=	bin/xmoontool 

.include <bsd.port.pre.mk> 
+ 
+.if ${OSVERSION} < 503000	# libnova currently not available here! 
+WITHOUT_LIBNOVA=	yes 
+.endif 
+ 
+.if defined(WITHOUT_LIBNOVA) 
+MAKE_ENV+=	WITHOUT_LIBNOVA=yes 
+.else 
+LIB_DEPENDS+=	nova:${PORTSDIR}/astro/libnova 
+.endif 
+ 
+pre-everything:: 
+.if !defined(WITHOUT_LIBNOVA) 
+	@${ECHO_MSG} "You can disable libnova support by defining WITHOUT_LIBNOVA" 
+.endif 

pre-configure: 
.if !defined(WITHOUT_DEFAULT_COLOR) 
diff -urN astro/xmoontool.orig/distinfo astro/xmoontool/distinfo 
--- astro/xmoontool.orig/distinfo	Tue Jan 31 20:44:26 2006 
+++ astro/xmoontool/distinfo	Wed Mar 22 22:29:21 2006 
@@ -1,3 +1,3 @@ 
-MD5 (xmoontool-3.0.2.tar.gz) = 5556d08574f25a6098858343b702d343 
-SHA256 (xmoontool-3.0.2.tar.gz) = eb5eeb4da988e62dfadcbf7189e072cb9c83b62e005130e84621a5ad487b2c8b 
-SIZE (xmoontool-3.0.2.tar.gz) = 20394 
+MD5 (xmoontool-3.0.3.tar.gz) = 1688d1176d197c1c4f28711e410a28e3 
+SHA256 (xmoontool-3.0.3.tar.gz) = eda8312eedf86116e2b8289ce7c7e3e93ea45f621b1c13a187aa2d3885704d32 
+SIZE (xmoontool-3.0.3.tar.gz) = 24354 
diff -urN astro/xmoontool.orig/files/patch-Makefile astro/xmoontool/files/patch-Makefile 
--- astro/xmoontool.orig/files/patch-Makefile	Thu Jan  1 01:00:00 1970 
+++ astro/xmoontool/files/patch-Makefile	Wed Mar 22 22:42:12 2006 
@@ -0,0 +1,22 @@ 
+--- Makefile.orig	Fri Feb 24 23:00:24 2006 
++++ Makefile	Wed Mar 22 22:41:40 2006 
+@@ -8,14 +8,14 @@ 
+ LOCALBASE?=	/usr/local 
+ X11BASE?= 	/usr/X11R6 
+  
+-CC= 		gcc 
+-CFLAGS= 	-O2 -Wall 
+-LDFLAGS=	-lXm -lXt -lX11 -lm 
++#CC= 		gcc 
++#CFLAGS= 	-O2 -Wall 
++LDFLAGS+=	-lXm -lXt -lX11 -lm 
+ DEFINES?= 	-DDEFAULT_COLOR 
+ ALL_CFLAGS= 	$(CFLAGS) $(DEFINES) -I$(X11BASE)/include -L$(X11BASE)/lib 
+  
+-bindir= 	$(X11BASE)/bin 
+-mandir= 	$(X11BASE)/man 
++bindir= 	$(PREFIX)/bin 
++mandir= 	$(PREFIX)/man 
+ mandir1= 	$(mandir)/man1 
+ catdir1= 	$(mandir)/cat1 
+  
--- xmoontool.diff ends here --- 



Responsible-Changed-From-To: freebsd-ports-bugs->thierry 
Responsible-Changed-By: thierry 
Responsible-Changed-When: Wed Mar 22 21:50:17 UTC 2006 
Responsible-Changed-Why:  

Take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=93972 

From: "Frank W. Josellis" <frank@dynamical-systems.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/93972: Update port: astro/xmoontool to 3.0.3
Date: Thu, 23 Mar 2006 19:38:03 +0100 (CET)

 I guess a copy of the message should have been addressed to bug-followup, 
 so here it is.
 
 ---------- Forwarded message ----------
 Date: Thu, 23 Mar 2006 14:29:12 +0100 (CET)
 From: Frank W. Josellis <frank@dynamical-systems.org>
 To: Thierry Thomas <thierry@FreeBSD.org>
 Cc: freebsd-ports-bugs@FreeBSD.org
 Subject: Re: ports/93972: Update port: astro/xmoontool to 3.0.3
 
 
 
 On Wed, 22 Mar 2006, Thierry Thomas wrote:
 
 > This port does not respect CFLAGS, CC nor PREFIX; what about the
 > following patch? (Since I'm there, reorganize Makefile)
 
 You are right, but please note that patching PREFIX into the tarball's 
 Makefile has no effect on the port. It's only the install target that 
 involves PREFIX. This isn't used, as the port's installation is solely 
 carried out by do-install in the port's Makefile.
 
 Well, I considered the tarball's CC and CFLAGS settings as acceptable for 
 the port and couldn't imagine a situation where it is essential to have 
 them overwritten. But I suppose you are more acquainted with the formal 
 requirements on FreeBSD ports, so I better leave it to you. If you feel 
 it's an advantage which justifies the patch, I won't protest.
 
 I wasn't yet aware that USE_REINPLACE meanwhile became obsolete, but I'll 
 know in future.
 
 Thanks!
 
 Frank Josellis
 
State-Changed-From-To: feedback->closed 
State-Changed-By: thierry 
State-Changed-When: Fri Mar 24 10:05:01 UTC 2006 
State-Changed-Why:  

Committed, thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=93972 

From: Thierry Thomas <thierry@FreeBSD.org>
To: "Frank W. Josellis" <frank@dynamical-systems.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/93972: Update port: astro/xmoontool to 3.0.3
Date: Fri, 24 Mar 2006 11:02:24 +0100

 On Thu 23 mar 06 at 14:29:12 +0100, Frank W. Josellis <frank@dynamical-systems.org>
  wrote:
 > > This port does not respect CFLAGS, CC nor PREFIX; what about the
 > > following patch? (Since I'm there, reorganize Makefile)
 > 
 > You are right, but please note that patching PREFIX into the tarball's 
 > Makefile has no effect on the port. It's only the install target that 
 > involves PREFIX. This isn't used, as the port's installation is solely 
 > carried out by do-install in the port's Makefile.
 
 Oops! I missed that...
 
 > Well, I considered the tarball's CC and CFLAGS settings as acceptable for 
 > the port and couldn't imagine a situation where it is essential to have 
 > them overwritten. But I suppose you are more acquainted with the formal 
 > requirements on FreeBSD ports, so I better leave it to you. If you feel 
 > it's an advantage which justifies the patch, I won't protest.
 
 Thanks for your feedback.
 -- 
 Th. Thomas.
>Unformatted:
