aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordb <db@FreeBSD.org>2013-11-05 03:52:36 +0800
committerdb <db@FreeBSD.org>2013-11-05 03:52:36 +0800
commitbab6bbc470d78a22412fe44f738b7d9dbd85848e (patch)
treeed4a69f06f69a2da09328c6ca408661e4f948cf0
parent71f6480bbbf98a8a7c9d851af15c8bb56e266cf6 (diff)
downloadfreebsd-ports-gnome-bab6bbc470d78a22412fe44f738b7d9dbd85848e.tar.gz
freebsd-ports-gnome-bab6bbc470d78a22412fe44f738b7d9dbd85848e.tar.zst
freebsd-ports-gnome-bab6bbc470d78a22412fe44f738b7d9dbd85848e.zip
- Fix stagedir
- disable automake run if automake is present on system PR: ports/183256 Submitted by: takefu@airport.fm
-rw-r--r--comms/thebridge/Makefile20
-rw-r--r--comms/thebridge/files/patch-src_Makefile.in4
-rw-r--r--comms/thebridge/files/patch-tbdcmd_Makefile.in11
3 files changed, 21 insertions, 14 deletions
diff --git a/comms/thebridge/Makefile b/comms/thebridge/Makefile
index 2e1481844cb8..f16354370d65 100644
--- a/comms/thebridge/Makefile
+++ b/comms/thebridge/Makefile
@@ -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>
diff --git a/comms/thebridge/files/patch-src_Makefile.in b/comms/thebridge/files/patch-src_Makefile.in
index 709b47e50969..80ab2dba0a2a 100644
--- a/comms/thebridge/files/patch-src_Makefile.in
+++ b/comms/thebridge/files/patch-src_Makefile.in
@@ -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 --git a/comms/thebridge/files/patch-tbdcmd_Makefile.in b/comms/thebridge/files/patch-tbdcmd_Makefile.in
new file mode 100644
index 000000000000..a64d2e8f3ea4
--- /dev/null
+++ b/comms/thebridge/files/patch-tbdcmd_Makefile.in
@@ -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