From nemysis@gmx.ch  Sun Sep 16 23:42:14 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 154291065672
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Sep 2012 23:42:14 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22])
	by mx1.freebsd.org (Postfix) with SMTP id 861528FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Sep 2012 23:42:12 +0000 (UTC)
Received: (qmail invoked by alias); 16 Sep 2012 23:42:05 -0000
Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201]
  by mail.gmx.net (mp034) with SMTP; 17 Sep 2012 01:42:05 +0200
Received: by something.email.com (sSMTP sendmail emulation); Mon, 17 Sep 2012 01:42:05 +0200
Message-Id: <20120916234214.154291065672@hub.freebsd.org>
Date: Mon, 17 Sep 2012 01:42:05 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gahr@FreeBSD.org
Subject: [PATCH] x11-toolkits/fox17: Wrong install in /usr/local/bin/fox-1.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171695
>Category:       ports
>Synopsis:       [PATCH] x11-toolkits/fox17: Wrong install in /usr/local/bin/fox-1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gahr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 16 23:50:09 UTC 2012
>Closed-Date:    Tue Sep 18 08:36:05 UTC 2012
>Last-Modified:  Tue Sep 18 08:36:05 UTC 2012
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:

Install in /usr/local/bin

+		--bindir=${PREFIX}/bin

Wrong install in /usr/local/bin/fox-1.7 where is not in Path

-		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}


- pkg-plist changed


Port maintainer (gahr@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- fox-1.7.36_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/fox17/Makefile ./Makefile
--- /usr/ports/x11-toolkits/fox17/Makefile	2012-08-30 16:17:38.000000000 +0200
+++ ./Makefile	2012-09-17 01:19:14.000000000 +0200
@@ -7,9 +7,10 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.7.36
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
-   		ftp://ftp.fox-toolkit.org/pub/
+		ftp://ftp.fox-toolkit.org/pub/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit -- devel version
@@ -33,7 +34,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=yes \
-		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
+		--bindir=${PREFIX}/bin
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -76,13 +77,14 @@
 
 post-patch:
 	for f in ${MAN1}; do \
-	    old=$$(echo $$f | sed -e 's|-17||'); \
-	    dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
-	    mv $$dir/$$old $$dir/$$f; \
+		old=$$(echo $$f | sed -e 's|-17||'); \
+		dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
+		mv $$dir/$$old $$dir/$$f; \
 	done
 	${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
-	    ${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
+		${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
 	${REINPLACE_CMD} -e '/^Libs:/s|$$| ${PTHREAD_LIBS}|; s|"||g' ${WRKSRC}/fox17.pc.in
+
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} -e '/^SUBDIRS/s/ doc//' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
 .endif
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/fox17/pkg-plist ./pkg-plist
--- /usr/ports/x11-toolkits/fox17/pkg-plist	2012-08-30 16:17:38.000000000 +0200
+++ ./pkg-plist	2012-09-17 01:24:33.000000000 +0200
@@ -1,11 +1,11 @@
-bin/fox-%%MAJORVER%%/Adie.stx
-bin/fox-%%MAJORVER%%/ControlPanel
-bin/fox-%%MAJORVER%%/PathFinder
-bin/fox-%%MAJORVER%%/adie
-bin/fox-%%MAJORVER%%/calculator
-bin/fox-%%MAJORVER%%/fox-config
-bin/fox-%%MAJORVER%%/reswrap
-bin/fox-%%MAJORVER%%/shutterbug
+bin/Adie.stx
+bin/ControlPanel
+bin/PathFinder
+bin/adie
+bin/calculator
+bin/fox-config
+bin/reswrap
+bin/shutterbug
 libdata/pkgconfig/fox17.pc
 lib/libCHART-%%MAJORVER%%.a
 lib/libCHART-%%MAJORVER%%.la
@@ -351,7 +351,6 @@
 include/fox-%%MAJORVER%%/xincs.h
 @dirrm include/fox-%%MAJORVER%%/chart
 @dirrm include/fox-%%MAJORVER%%
-@dirrm bin/fox-%%MAJORVER%%
 %%PORTDOCS%%%%DOCSDIR%%/html/adie.html
 %%PORTDOCS%%%%DOCSDIR%%/html/app.html
 %%PORTDOCS%%%%DOCSDIR%%/html/art/bigpenguin.png
--- fox-1.7.36_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Sep 16 23:50:52 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171695 
State-Changed-From-To: open->analyzed 
State-Changed-By: gahr 
State-Changed-When: Mon Sep 17 07:25:11 UTC 2012 
State-Changed-Why:  
${PREFIX}/bin/${PORTNAME}-${MAJORVER} is used so that fox16 and fox17 
can coexist (and to avoid polluting bin). I suggest that you add it to 
your path, if needed 

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

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org, gahr@FreeBSD.org
Cc:  
Subject: Re: ports/171695: [PATCH] x11-toolkits/fox17: Wrong install in
 /usr/local/bin/fox-1.7
Date: Mon, 17 Sep 2012 14:39:34 +0200

 --MP_/F5329AoEgnNpJBM7DMUdc=a
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Added
 
 CONFLICTS=      fox-1.4.* fox-1.6.*
 
 As in
 
 x11-toolkits/fox14
 
 CONFLICTS=      fox-1.6.* fox-1.7.*
 
 
 Please add to, and change it as i have made for 1.7
 
 x11-toolkits/fox16
 
 CONFLICTS=      fox-1.4.* fox-1.7.*
 
 
 Hope this is good.
 
 For a application to make more in PATH isn't good.
 This is GNU/Linux mess.
 
 
 --MP_/F5329AoEgnNpJBM7DMUdc=a
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=fox17.diff
 
 Original version does not exist at /usr/ports/x11-toolkits/fox
 Using /usr/ports/x11-toolkits/fox17 instead
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/x11-toolkits/fox17/Makefile ./Makefile
 --- /usr/ports/x11-toolkits/fox17/Makefile	2012-08-30 16:17:38.000000000 +0200
 +++ ./Makefile	2012-09-17 14:30:04.000000000 +0200
 @@ -7,9 +7,10 @@
  
  PORTNAME=	fox
  PORTVERSION=	1.7.36
 +PORTREVISION=	1
  CATEGORIES=	x11-toolkits
  MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
 -   		ftp://ftp.fox-toolkit.org/pub/
 +		ftp://ftp.fox-toolkit.org/pub/
  
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	Fast and extensive C++ GUI toolkit -- devel version
 @@ -33,11 +34,13 @@
  
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--with-opengl=yes \
 -		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
 +		--bindir=${PREFIX}/bin
  
  CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
  LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
  
 +CONFLICTS=	fox-1.4.* fox-1.6.*
 +
  MAN1=		reswrap-17.1 shutterbug-17.1 adie-17.1 PathFinder-17.1 \
  		calculator-17.1 ControlPanel-17.1
  .for man1 in ${MAN1}
 @@ -76,13 +79,14 @@
  
  post-patch:
  	for f in ${MAN1}; do \
 -	    old=$$(echo $$f | sed -e 's|-17||'); \
 -	    dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
 -	    mv $$dir/$$old $$dir/$$f; \
 +		old=$$(echo $$f | sed -e 's|-17||'); \
 +		dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
 +		mv $$dir/$$old $$dir/$$f; \
  	done
  	${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
 -	    ${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
 +		${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
  	${REINPLACE_CMD} -e '/^Libs:/s|$$| ${PTHREAD_LIBS}|; s|"||g' ${WRKSRC}/fox17.pc.in
 +
  .if defined(NOPORTDOCS)
  	${REINPLACE_CMD} -e '/^SUBDIRS/s/ doc//' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
  .endif
 diff -ruN --exclude=CVS /usr/ports/x11-toolkits/fox17/pkg-plist ./pkg-plist
 --- /usr/ports/x11-toolkits/fox17/pkg-plist	2012-08-30 16:17:38.000000000 +0200
 +++ ./pkg-plist	2012-09-17 01:24:33.000000000 +0200
 @@ -1,11 +1,11 @@
 -bin/fox-%%MAJORVER%%/Adie.stx
 -bin/fox-%%MAJORVER%%/ControlPanel
 -bin/fox-%%MAJORVER%%/PathFinder
 -bin/fox-%%MAJORVER%%/adie
 -bin/fox-%%MAJORVER%%/calculator
 -bin/fox-%%MAJORVER%%/fox-config
 -bin/fox-%%MAJORVER%%/reswrap
 -bin/fox-%%MAJORVER%%/shutterbug
 +bin/Adie.stx
 +bin/ControlPanel
 +bin/PathFinder
 +bin/adie
 +bin/calculator
 +bin/fox-config
 +bin/reswrap
 +bin/shutterbug
  libdata/pkgconfig/fox17.pc
  lib/libCHART-%%MAJORVER%%.a
  lib/libCHART-%%MAJORVER%%.la
 @@ -351,7 +351,6 @@
  include/fox-%%MAJORVER%%/xincs.h
  @dirrm include/fox-%%MAJORVER%%/chart
  @dirrm include/fox-%%MAJORVER%%
 -@dirrm bin/fox-%%MAJORVER%%
  %%PORTDOCS%%%%DOCSDIR%%/html/adie.html
  %%PORTDOCS%%%%DOCSDIR%%/html/app.html
  %%PORTDOCS%%%%DOCSDIR%%/html/art/bigpenguin.png
 ===> Done
 
 --MP_/F5329AoEgnNpJBM7DMUdc=a--

From: Pietro Cerutti <gahr@FreeBSD.org>
To: nemysis <nemysis@gmx.ch>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/171695: [PATCH] x11-toolkits/fox17: Wrong install in
 /usr/local/bin/fox-1.7
Date: Mon, 17 Sep 2012 16:22:39 +0200

 --6lCXDTVICvIQMz0h
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Sorry, I am not about to introduce conflicts between fox16 and fox17. I
 very much prefer to have them both installed at the same time, at the
 tiny cost of creting two additional subdirs in bin.
 
 Oh, and I don't see how this is related to GNU/Linux, where everything's
 in /usr/bin. It's quite the opposite in my opinion.
 
 --=20
 Pietro Cerutti
 The FreeBSD Project
 gahr@FreeBSD.org
 
 PGP Public Key:
 http://gahr.ch/pgp
 
 --6lCXDTVICvIQMz0h
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAlBXMi4ACgkQwMJqmJVx944iDACg3BEoej2pzDfSGdHsCYtvw5Xa
 FmAAoMN6g2RZw3CxlCIDcelsMXhORA5p
 =qOdv
 -----END PGP SIGNATURE-----
 
 --6lCXDTVICvIQMz0h--
State-Changed-From-To: analyzed->closed 
State-Changed-By: gahr 
State-Changed-When: Tue Sep 18 08:36:04 UTC 2012 
State-Changed-Why:  
No action to be taken at this time. 

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