From bz@zabbadoz.net  Fri Feb 24 20:05:12 2006
Return-Path: <bz@zabbadoz.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3C87216A420
	for <freebsd-gnats-submit@freebsd.org>; Fri, 24 Feb 2006 20:05:12 +0000 (GMT)
	(envelope-from bz@zabbadoz.net)
Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B516043D45
	for <freebsd-gnats-submit@freebsd.org>; Fri, 24 Feb 2006 20:05:11 +0000 (GMT)
	(envelope-from bz@zabbadoz.net)
Received: from transport.cksoft.de (localhost [127.0.0.1])
	by transport.cksoft.de (Postfix) with ESMTP id C49601FFF00
	for <freebsd-gnats-submit@freebsd.org>; Fri, 24 Feb 2006 21:05:07 +0100 (CET)
Received: by transport.cksoft.de (Postfix, from userid 66)
	id 310B21FFF7F; Fri, 24 Feb 2006 21:05:05 +0100 (CET)
Received: by mail.int.zabbadoz.net (Postfix, from userid 1060)
	id 0D6A84448D6; Fri, 24 Feb 2006 20:00:21 +0000 (UTC)
Message-Id: <20060224200021.0D6A84448D6@mail.int.zabbadoz.net>
Date: Fri, 24 Feb 2006 20:00:21 +0000 (UTC)
From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Reply-To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Subject: [maint-upd] emulators/hercules to 3.04
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         93806
>Category:       ports
>Synopsis:       maintainer-update: emulators/hercules to 3.04
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    stefan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 24 20:10:05 GMT 2006
>Closed-Date:    Sat May 13 21:57:09 GMT 2006
>Last-Modified:  Sat May 13 22:00:40 GMT 2006
>Originator:     Bjoern A. Zeeb
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
Zabbadoz.NeT
>Environment:
System: FreeBSD foo 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sun Oct 30 18:31:51 UTC 2005 bz@foo:/path/to/HEAD/sys/KERNEL amd64

>Description:
	
	hercules 3.04 was released today.

	! Update emulators/hercules from 3.03.1 to 3.04.
	! 
	! - version update
	! - fix plist in WITHOUT_NLS case
	! - files removed:
	!   files/patch-configure
	!   files/patch-fbdcompile
	!   files/patch-herconf
	! - files added:
	!   files/patch-hercifc.h

>How-To-Repeat:
>Fix:
	a patch can be found at:
	http://sources.zabbadoz.net/freebsd/ports/
	[ http://sources.zabbadoz.net/freebsd/ports/hercules-3.03.1-3.04.diff ]

>Release-Note:
>Audit-Trail:

From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: bug-followup@FreeBSD.org,
	"Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc:  
Subject: Re: ports/93806: [maint-upd] emulators/hercules to 3.04
Date: Sun, 9 Apr 2006 13:24:28 +0000 (UTC)

 here's next patch for files/patch-tuntap-sin_len that has to
 be added in addition to the already submitted ones.
 You can also fetch it from 
 http://sources.zabbadoz.net/freebsd/ports/hercules-files-patch-tuntap-sin_len
 
 PS: I'd be happy if someone could have a look at this port and commit it:)
 
 --------- put this in files/patch-tuntap-sin_len ------------------
 --- ./tuntap.c.orig	Sun Apr  9 12:00:35 2006
 +++ ./tuntap.c	Sun Apr  9 12:01:35 2006
 @@ -230,6 +230,7 @@ int             TUNTAP_SetIPAddr( char*
       sin = (struct sockaddr_in*)&ifreq.ifr_addr;
 
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetDevName || !*pszNetDevName )
       {
 @@ -266,6 +267,7 @@ int             TUNTAP_SetDestAddr( char
       sin = (struct sockaddr_in*)&ifreq.ifr_addr;
 
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetDevName || !*pszNetDevName )
       {
 @@ -302,6 +304,7 @@ int           TUNTAP_SetNetMask( char*
       sin = (struct sockaddr_in*)&ifreq.ifr_netmask;
 
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetDevName || !*pszNetDevName )
       {
 @@ -339,6 +342,7 @@ int             TUNTAP_SetMTU( char*   p
       sin = (struct sockaddr_in*)&ifreq.ifr_addr;
 
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetDevName || !*pszNetDevName )
       {
 @@ -424,6 +428,7 @@ int             TUNTAP_SetFlags ( char*
       sin = (struct sockaddr_in*)&ifreq.ifr_addr;
 
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetDevName || !*pszNetDevName )
       {
 @@ -465,6 +470,7 @@ int           TUNTAP_AddRoute( char*   p
 
       sin = (struct sockaddr_in*)&rtentry.rt_dst;
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszDestAddr  ||
           !inet_aton( pszDestAddr, &sin->sin_addr ) )
 @@ -476,6 +482,7 @@ int           TUNTAP_AddRoute( char*   p
 
       sin = (struct sockaddr_in*)&rtentry.rt_genmask;
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetMask  ||
           !inet_aton( pszNetMask, &sin->sin_addr ) )
 @@ -489,6 +496,7 @@ int           TUNTAP_AddRoute( char*   p
       {
           sin = (struct sockaddr_in*)&rtentry.rt_gateway;
           sin->sin_family = AF_INET;
 +        sin->sin_len = sizeof( struct sockaddr_in );
 
           if( !inet_aton( pszGWAddr, &sin->sin_addr ) )
           {
 @@ -530,6 +538,7 @@ int           TUNTAP_DelRoute( char*   p
 
       sin = (struct sockaddr_in*)&rtentry.rt_dst;
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszDestAddr  ||
           !inet_aton( pszDestAddr, &sin->sin_addr ) )
 @@ -541,6 +550,7 @@ int           TUNTAP_DelRoute( char*   p
 
       sin = (struct sockaddr_in*)&rtentry.rt_genmask;
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszNetMask  ||
           !inet_aton( pszNetMask, &sin->sin_addr ) )
 @@ -552,6 +562,7 @@ int           TUNTAP_DelRoute( char*   p
 
       sin = (struct sockaddr_in*)&rtentry.rt_gateway;
       sin->sin_family = AF_INET;
 +    sin->sin_len = sizeof( struct sockaddr_in );
 
       if( !pszGWAddr  ||
           !inet_aton( pszGWAddr, &sin->sin_addr ) )
 --------- /put this in files/patch-tuntap-sin_len ------------------
State-Changed-From-To: open->feedback 
State-Changed-By: ehaupt 
State-Changed-When: Wed Apr 12 00:18:12 CEST 2006 
State-Changed-Why:  
Could you maybe submit a patch (diff -Nur) including all the patches? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93806 
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Wed Apr 12 13:20:39 CEST 2006 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93806 
State-Changed-From-To: feedback->open 
State-Changed-By: ehaupt 
State-Changed-When: Wed Apr 12 13:20:49 CEST 2006 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93806 
State-Changed-From-To: open->feedback 
State-Changed-By: ehaupt 
State-Changed-When: Wed Apr 12 14:35:00 CEST 2006 
State-Changed-Why:  
After the update the port does not fully respect CFLAGS (it uses -O3 against my 
will). Can you please fix it? 

See also: 
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/dads-cflags.html 


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

From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04
Date: Thu, 13 Apr 2006 17:29:14 +0000 (UTC)

 > After the update the port does not fully respect CFLAGS (it uses -O3 against my
 > will). Can you please fix it?
 
 I have tought a bit about it and decided to do it though it does not
 make a lot of sense for this port to give you such a free will.
 So you'll mostly end up building a debug version without debugging
 symbols or something like that...
 
 The new patch is here for fetching:
 http://sources.zabbadoz.net/freebsd/ports/hercules-3.04-20060413.diff

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>,
	bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04
Date: Thu, 13 Apr 2006 19:48:35 +0200

 On Thu, 13 Apr 2006 17:40:17 GMT
 "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net> wrote:
 
 > The following reply was made to PR ports/93806; it has been noted by
 > GNATS.
 > 
 > From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
 > To: bug-followup@FreeBSD.org
 > Cc:  
 > Subject: Re: ports/93806: maintainer-update: emulators/hercules to
 > 3.04 Date: Thu, 13 Apr 2006 17:29:14 +0000 (UTC)
 > 
 >  > After the update the port does not fully respect CFLAGS (it uses
 >  > -O3 against my will). Can you please fix it?
 >  
 >  I have tought a bit about it and decided to do it though it does not
 >  make a lot of sense for this port to give you such a free will.
 >  So you'll mostly end up building a debug version without debugging
 >  symbols or something like that...
 
 It's not optional, it's a *requirement*:
 
 http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/dads-cflags.html

From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04
Date: Thu, 13 Apr 2006 17:57:26 +0000 (UTC)

 > It's not optional, it's a *requirement*:
 >
 > http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/dads-cflags.html
 
 yes, and it works that way now (though it doesn't really make sense).
 If there are more minor nits could you please let me know in bulk.
 Thanks.
 
Responsible-Changed-From-To: ehaupt->freebsd-ports-bugs 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Thu Apr 13 20:25:44 CEST 2006 
Responsible-Changed-Why:  
Release. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93806 
State-Changed-From-To: feedback->open 
State-Changed-By: ehaupt 
State-Changed-When: Thu Apr 13 20:41:08 CEST 2006 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93806 
Responsible-Changed-From-To: freebsd-ports-bugs->stefan 
Responsible-Changed-By: stefan 
Responsible-Changed-When: Sat May 13 09:20:22 UTC 2006 
Responsible-Changed-Why:  
Take. 

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

From: Stefan Walter <stefan@FreeBSD.org>
To: GNATS <FreeBSD-gnats-submit@FreeBSD.org>,
	"Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc: stefan@freebsd.org
Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04
Date: Sat, 13 May 2006 20:45:52 +0200

 Hi,
 
 with me, the .mo files at the bottom of the pkg-plist aren't installed and
 thus result in an error message upon 'make deinstall' with the new
 version. Could you have a look at that?
 
 Regards,
 Stefan

From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
To: Stefan Walter <stefan@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04
Date: Sat, 13 May 2006 20:28:58 +0000 (UTC)

 On Sat, 13 May 2006, Stefan Walter wrote:
 
 Hi,
 
 > with me, the .mo files at the bottom of the pkg-plist aren't installed and
 > thus result in an error message upon 'make deinstall' with the new
 > version. Could you have a look at that?
 
 Following change was in the patch to the Makefile:
 
   .if defined(WITHOUT_NLS)
   CONFIGURE_ARGS+=	--disable-nls
 +PLIST_SUB+=		GETTEXT="@comment "
   .else
   USE_GETTEXT=		yes
 +PLIST_SUB+=		GETTEXT=""
   .endif
 
 and should correctly subsitute what is in pkg-plist with the patch
 to my understanding?
 
   @dirrm share/hercules
 -share/locale/de/LC_MESSAGES/hercules.mo
 -share/locale/nl/LC_MESSAGES/hercules.mo
 +%%GETTEXT%%share/locale/de/LC_MESSAGES/hercules.mo
 +%%GETTEXT%%share/locale/nl/LC_MESSAGES/hercules.mo
 
 
 I tried with both NLS turned on and off and failed to reproduce the
 problem with make install && make deinstall && make package &&
 pkg_delete /var/db/pkg/hercules-3.04/
 
 Are you building with or without WITHOUT_NLS? Perhaps it would be best
 if you could tell me your build env (options file, command line
 options to make, make.conf entries, ...)?
 Also could you check that you removed the three patches from files/ 
 that are no longer needed?
 
 Would it help you if I'd put the lastest version of emulators/hercules
 port src into a tarball and load it up?
 
 -- 
 Bjoern A. Zeeb				bzeeb at Zabbadoz dot NeT
State-Changed-From-To: open->closed 
State-Changed-By: stefan 
State-Changed-When: Sat May 13 21:56:51 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

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

From: Stefan Walter <stefan@FreeBSD.org>
To: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net>
Cc: bug-followup@FreeBSD.org, stefan@freebsd.org
Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04
Date: Sat, 13 May 2006 23:56:36 +0200

 Bjoern A. Zeeb, 13.05.06, 22:28h CEST:
 
 > I tried with both NLS turned on and off and failed to reproduce the
 > problem with make install && make deinstall && make package &&
 > pkg_delete /var/db/pkg/hercules-3.04/
 > 
 > Are you building with or without WITHOUT_NLS? Perhaps it would be best
 > if you could tell me your build env (options file, command line
 > options to make, make.conf entries, ...)?
 
 What I had set explicitly and what seems to cause the files not to be
 installed is PREFIX. Without setting PREFIX, everything installs and
 deinstalls just fine. I have committed the patch, anyway, but could you
 have a look at that?
 
 Stefan
>Unformatted:
