Bug 183256 - [PATCH] comms/thebridge: fix stage
Summary: [PATCH] comms/thebridge: fix stage
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Diane Bruce
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-24 06:10 UTC by takefu
Modified: 2013-11-04 20:00 UTC (History)
1 user (show)

See Also:

Attachments
thebridge-1.09.patch (3.01 KB, patch)
2013-10-24 06:10 UTC, takefu 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description takefu 2013-10-24 06:10:01 UTC 
fix
  StageDir
  binary strip

Port maintainer (db@FreeBSD.org) is cc'd.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-24 06:10:09 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->db

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 takefu 2013-10-24 07:25:41 UTC 
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 ---
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-11-04 19:52:44 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"
Comment 4 Diane Bruce freebsd_committer freebsd_triage 2013-11-04 19:53:16 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!