Date: Mon, 4 Nov 2013 19:52:36 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332762 - in head/comms/thebridge: . files Message-ID: <201311041952.rA4JqaY2014521@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311041952.rA4JqaY2014521>