From takefu@airport.fm  Thu Oct 24 05:09:41 2013
Return-Path: <takefu@airport.fm>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id B97586A5;
	Thu, 24 Oct 2013 05:09:41 +0000 (UTC)
	(envelope-from takefu@airport.fm)
Received: from ae-osaka.co.jp (mx.ae-osaka.co.jp [210.196.184.82])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 54D572927;
	Thu, 24 Oct 2013 05:09:40 +0000 (UTC)
Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1])
	by ae-osaka.co.jp (Postfix) with ESMTP id 94578126078;
	Thu, 24 Oct 2013 14:09:02 +0900 (JST)
Received: from [IPv6:2001:470:824b:a011:416c:1d4a:372b:6195] (unknown [IPv6:2001:470:824b:a011:416c:1d4a:372b:6195])
	by ae-osaka.co.jp (Postfix) with ESMTPSA id 1F4A3126076;
	Thu, 24 Oct 2013 14:09:02 +0900 (JST)
Message-Id: <5268AB6F.8050601@airport.fm>
Date: Thu, 24 Oct 2013 14:09:03 +0900
From: Takefu <takefu@airport.fm>
To: freebsd-gnats-submit@freebsd.org
Cc: db@FreeBSD.org
Subject: [PATCH] comms/thebridge: fix StageDir

>Number:         183256
>Category:       ports
>Synopsis:       [PATCH] comms/thebridge: fix stage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    db
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 24 05:10:01 UTC 2013
>Closed-Date:    Mon Nov 04 19:53:17 UTC 2013
>Last-Modified:  Mon Nov  4 20:00:00 UTC 2013
>Originator:     Takefu
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0: Wed Sep 25 14:55:36 JST 2013
>Description:
fix
  StageDir
  binary strip

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

>How-To-Repeat:
>Fix:

--- thebridge-1.09.patch begins here ---
diff -ruN /usr/ports/comms/thebridge/Makefile ./Makefile
--- /usr/ports/comms/thebridge/Makefile	2013-09-30 08:40:13.000000000 +0900
+++ ./Makefile	2013-10-24 13:20:19.000000000 +0900
@@ -11,28 +11,21 @@
 COMMENT=	Amateur Radio Echolink conference bridge

 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		gmake
 GNU_CONFIGURE=	yes
 PORTDOCS=	README
 USE_RC_SUBR=	tbd

-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},; \
-		s,%%PREFIX%%,${PREFIX},' \
-		${WRKSRC}/addons/usermgmt.cgi
+.include <bsd.port.pre.mk>

 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}
 .endif
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/addons/README ${DATADIR}
+	${MKDIR} ${STAGEDIR}/${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${STAGEDIR}/${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/addons/README ${STAGEDIR}/${DATADIR}

 .include <bsd.port.mk>
diff -ruN /usr/ports/comms/thebridge/files/patch-src_Makefile.in ./files/patch-src_Makefile.in
--- /usr/ports/comms/thebridge/files/patch-src_Makefile.in	2013-01-07 23:28:10.000000000 +0900
+++ ./files/patch-src_Makefile.in	2013-10-24 13:57:33.000000000 +0900
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	2012-12-10 01:00:44.000000000 -0500
-+++ src/Makefile.in	2013-01-03 18:54:09.000000000 -0500
+--- src/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
++++ src/Makefile.in	2013-10-24 13:57:30.000000000 +0900
 @@ -115,7 +115,7 @@
  tbd_OBJECTS = $(am_tbd_OBJECTS)
  am__DEPENDENCIES_1 =
@@ -33,3 +33,12 @@
  @LINK_BOX_FALSE@            $(LIBDMALLOC) -lm

  all: all-am
+@@ -450,7 +450,7 @@
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+-install-exec: install-exec-am
++install-exec: install-strip install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
diff -ruN /usr/ports/comms/thebridge/files/patch-tbdcmd_Makefile.in ./files/patch-tbdcmd_Makefile.in
--- /usr/ports/comms/thebridge/files/patch-tbdcmd_Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ ./files/patch-tbdcmd_Makefile.in	2013-10-24 13:36:41.000000000 +0900
@@ -0,0 +1,20 @@
+--- tbdcmd/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
++++ tbdcmd/Makefile.in	2013-10-24 13:36:31.000000000 +0900
+@@ -405,7 +405,7 @@
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+-install-exec: install-exec-am
++install-exec: install-strip install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+
+@@ -530,7 +530,7 @@
+ @LINK_BOX_FALSE@	if test -f $(DESTDIR)$(bindir)/tbdchat; then \
+ @LINK_BOX_FALSE@		rm $(DESTDIR)$(bindir)/tbdchat; \
+ @LINK_BOX_FALSE@	fi
+-@LINK_BOX_FALSE@	ln -s $(DESTDIR)$(bindir)/tbdcmd $(DESTDIR)$(bindir)/tbdchat
++@LINK_BOX_FALSE@	ln -s tbdcmd $(DESTDIR)$(bindir)/tbdchat
+
+ @LINK_BOX_FALSE@uninstall-hook:
+ @LINK_BOX_FALSE@	rm $(DESTDIR)$(bindir)/tbdchat
--- thebridge-1.09.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->db 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Oct 24 05:10:09 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Takefu <takefu@airport.fm>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/183256: [PATCH] comms/thebridge: fix StageDir
Date: Thu, 24 Oct 2013 15:25:41 +0900

 A correct patch file is transmitted.
 
 --- thebridge-1.09.patch begins here ---
 diff -ruN /usr/ports/comms/thebridge/Makefile ./Makefile
 --- /usr/ports/comms/thebridge/Makefile	2013-09-30 08:40:13.000000000 +0900
 +++ ./Makefile	2013-10-24 14:53:47.000000000 +0900
 @@ -11,28 +11,23 @@
  COMMENT=	Amateur Radio Echolink conference bridge
 
  LICENSE=	GPLv2
 -LICENSE_FILE=	${WRKSRC}/COPYING
 
  USES=		gmake
  GNU_CONFIGURE=	yes
  PORTDOCS=	README
  USE_RC_SUBR=	tbd
 
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 +INSTALL_TARGET=	install-strip
 
 -post-patch:
 -	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},; \
 -		s,%%PREFIX%%,${PREFIX},' \
 -		${WRKSRC}/addons/usermgmt.cgi
 +.include <bsd.port.pre.mk>
 
  post-install:
  .if ${PORT_OPTIONS:MDOCS}
 -	@${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 +	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}
  .endif
 -	${MKDIR} ${DATADIR}
 -	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${DATADIR}
 -	${INSTALL_DATA} ${WRKSRC}/addons/README ${DATADIR}
 +	${MKDIR} ${STAGEDIR}/${DATADIR}
 +	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${STAGEDIR}/${DATADIR}
 +	${INSTALL_DATA} ${WRKSRC}/addons/README ${STAGEDIR}/${DATADIR}
 
  .include <bsd.port.mk>
 diff -ruN /usr/ports/comms/thebridge/files/patch-src_Makefile.in ./files/patch-src_Makefile.in
 --- /usr/ports/comms/thebridge/files/patch-src_Makefile.in	2013-01-07 23:28:10.000000000 +0900
 +++ ./files/patch-src_Makefile.in	2013-10-24 14:54:41.000000000 +0900
 @@ -1,5 +1,5 @@
 ---- src/Makefile.in.orig	2012-12-10 01:00:44.000000000 -0500
 -+++ src/Makefile.in	2013-01-03 18:54:09.000000000 -0500
 +--- src/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
 ++++ src/Makefile.in	2013-10-24 13:57:30.000000000 +0900
  @@ -115,7 +115,7 @@
   tbd_OBJECTS = $(am_tbd_OBJECTS)
   am__DEPENDENCIES_1 =
 diff -ruN /usr/ports/comms/thebridge/files/patch-tbdcmd_Makefile.in ./files/patch-tbdcmd_Makefile.in
 --- /usr/ports/comms/thebridge/files/patch-tbdcmd_Makefile.in	1970-01-01 09:00:00.000000000 +0900
 +++ ./files/patch-tbdcmd_Makefile.in	2013-10-24 14:54:57.000000000 +0900
 @@ -0,0 +1,11 @@
 +--- tbdcmd/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
 ++++ tbdcmd/Makefile.in	2013-10-24 13:36:31.000000000 +0900
 +@@ -530,7 +530,7 @@
 + @LINK_BOX_FALSE@	if test -f $(DESTDIR)$(bindir)/tbdchat; then \
 + @LINK_BOX_FALSE@		rm $(DESTDIR)$(bindir)/tbdchat; \
 + @LINK_BOX_FALSE@	fi
 +-@LINK_BOX_FALSE@	ln -s $(DESTDIR)$(bindir)/tbdcmd $(DESTDIR)$(bindir)/tbdchat
 ++@LINK_BOX_FALSE@	ln -s tbdcmd $(DESTDIR)$(bindir)/tbdchat
 +
 + @LINK_BOX_FALSE@uninstall-hook:
 + @LINK_BOX_FALSE@	rm $(DESTDIR)$(bindir)/tbdchat
 --- thebridge-1.09.patch ends here ---
State-Changed-From-To: open->closed 
State-Changed-By: db 
State-Changed-When: Mon Nov 4 19:53:16 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183256: commit references a PR
Date: Mon,  4 Nov 2013 19:52:44 +0000 (UTC)

 Author: db
 Date: Mon Nov  4 19:52:36 2013
 New Revision: 332762
 URL: http://svnweb.freebsd.org/changeset/ports/332762
 
 Log:
   - Fix stagedir
   - disable automake run if automake is present on system
   
   PR:		ports/183256
   Submitted by:	takefu@airport.fm
 
 Added:
   head/comms/thebridge/files/patch-tbdcmd_Makefile.in   (contents, props changed)
 Modified:
   head/comms/thebridge/Makefile
   head/comms/thebridge/files/patch-src_Makefile.in
 
 Modified: head/comms/thebridge/Makefile
 ==============================================================================
 --- head/comms/thebridge/Makefile	Mon Nov  4 19:34:25 2013	(r332761)
 +++ head/comms/thebridge/Makefile	Mon Nov  4 19:52:36 2013	(r332762)
 @@ -11,28 +11,24 @@ MAINTAINER=	db@FreeBSD.org
  COMMENT=	Amateur Radio Echolink conference bridge
  
  LICENSE=	GPLv2
 -LICENSE_FILE=	${WRKSRC}/COPYING
  
  USES=		gmake
  GNU_CONFIGURE=	yes
  PORTDOCS=	README
  USE_RC_SUBR=	tbd
 +MAKE_ARGS=	AUTOMAKE="${TRUE}"
  
 -NO_STAGE=	yes
 -.include <bsd.port.options.mk>
 +INSTALL_TARGET=	install-strip
  
 -post-patch:
 -	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},; \
 -		s,%%PREFIX%%,${PREFIX},' \
 -		${WRKSRC}/addons/usermgmt.cgi
 +.include <bsd.port.pre.mk>
  
  post-install:
  .if ${PORT_OPTIONS:MDOCS}
 -	@${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 +	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}
  .endif
 -	${MKDIR} ${DATADIR}
 -	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${DATADIR}
 -	${INSTALL_DATA} ${WRKSRC}/addons/README ${DATADIR}
 +	${MKDIR} ${STAGEDIR}/${DATADIR}
 +	${INSTALL_SCRIPT} ${WRKSRC}/addons/usermgmt.cgi ${STAGEDIR}/${DATADIR}
 +	${INSTALL_DATA} ${WRKSRC}/addons/README ${STAGEDIR}/${DATADIR}
  
  .include <bsd.port.mk>
 
 Modified: head/comms/thebridge/files/patch-src_Makefile.in
 ==============================================================================
 --- head/comms/thebridge/files/patch-src_Makefile.in	Mon Nov  4 19:34:25 2013	(r332761)
 +++ head/comms/thebridge/files/patch-src_Makefile.in	Mon Nov  4 19:52:36 2013	(r332762)
 @@ -1,5 +1,5 @@
 ---- src/Makefile.in.orig	2012-12-10 01:00:44.000000000 -0500
 -+++ src/Makefile.in	2013-01-03 18:54:09.000000000 -0500
 +--- src/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
 ++++ src/Makefile.in	2013-10-24 13:57:30.000000000 +0900
  @@ -115,7 +115,7 @@
   tbd_OBJECTS = $(am_tbd_OBJECTS)
   am__DEPENDENCIES_1 =
 
 Added: head/comms/thebridge/files/patch-tbdcmd_Makefile.in
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/comms/thebridge/files/patch-tbdcmd_Makefile.in	Mon Nov  4 19:52:36 2013	(r332762)
 @@ -0,0 +1,11 @@
 +--- tbdcmd/Makefile.in.orig	2012-12-10 15:00:44.000000000 +0900
 ++++ tbdcmd/Makefile.in	2013-10-24 13:36:31.000000000 +0900
 +@@ -530,7 +530,7 @@
 + @LINK_BOX_FALSE@	if test -f $(DESTDIR)$(bindir)/tbdchat; then \
 + @LINK_BOX_FALSE@		rm $(DESTDIR)$(bindir)/tbdchat; \
 + @LINK_BOX_FALSE@	fi
 +-@LINK_BOX_FALSE@	ln -s $(DESTDIR)$(bindir)/tbdcmd $(DESTDIR)$(bindir)/tbdchat
 ++@LINK_BOX_FALSE@	ln -s tbdcmd $(DESTDIR)$(bindir)/tbdchat
 +
 + @LINK_BOX_FALSE@uninstall-hook:
 + @LINK_BOX_FALSE@	rm $(DESTDIR)$(bindir)/tbdchat
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
