summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2014-07-07 22:32:02 +0000
committerMatthias Andree <mandree@FreeBSD.org>2014-07-07 22:32:02 +0000
commit99fffb966baf00ab98bb3285c64bb462d0f73d61 (patch)
tree21e234ed4a202d8ee3c82ff4d2aab56f74291768 /www
parent- Update to 1.0.4 (diff)
Fix up recent commit [1]:
- Fix linking on systems that require listing all DSOs explicitly, to allow build on 10.0+ - this adds fcgi/files/patch-examples__Makefile.in - upstream should adjust his examples/Makefile.am accordingly. - Use ${RM} -f to avoid rm query if building as unprivileged user. PR: 191664 [1]
Notes
Notes: svn path=/head/; revision=361138
Diffstat (limited to 'www')
-rw-r--r--www/fcgi/Makefile4
-rw-r--r--www/fcgi/files/patch-examples__Makefile.in11
2 files changed, 13 insertions, 2 deletions
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index defcf391fd84..48a00725cdb9 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fcgi
PORTVERSION= 2.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.fastcgi.com/dist/ \
http://www.skysmurf.nl/comp/FreeBSD/distfiles/
@@ -33,7 +33,7 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
- @${RM} ${STAGEDIR}${DOCSDIR}/*.[13]
+ @${RM} -f ${STAGEDIR}${DOCSDIR}/*.[13]
.endif
.include <bsd.port.mk>
diff --git a/www/fcgi/files/patch-examples__Makefile.in b/www/fcgi/files/patch-examples__Makefile.in
new file mode 100644
index 000000000000..d297ead60fb5
--- /dev/null
+++ b/www/fcgi/files/patch-examples__Makefile.in
@@ -0,0 +1,11 @@
+--- ./examples/Makefile.in.orig 2003-01-19 18:21:17.000000000 +0100
++++ ./examples/Makefile.in 2014-07-08 00:25:16.000000000 +0200
+@@ -125,7 +125,7 @@
+ threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+
+ echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp
+-echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la
++echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBFCGI)
+ subdir = examples
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/fcgi_config.h