aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/mod_roaming/Makefile10
-rw-r--r--www/mod_roaming/files/httpd.conf.mod_roaming20
-rw-r--r--www/mod_roaming/pkg-message16
-rw-r--r--www/mod_roaming/pkg-plist3
-rw-r--r--www/mod_ruby/Makefile12
-rw-r--r--www/mod_ruby/files/httpd.conf.mod_ruby19
-rw-r--r--www/mod_ruby/pkg-message15
-rw-r--r--www/mod_ruby/pkg-plist3
8 files changed, 71 insertions, 27 deletions
diff --git a/www/mod_roaming/Makefile b/www/mod_roaming/Makefile
index 7ebed6b2dcbb..98f44a0bc4fd 100644
--- a/www/mod_roaming/Makefile
+++ b/www/mod_roaming/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mod_roaming
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.klomp.org/mod_roaming/
@@ -24,13 +25,14 @@ do-build:
${APXS} -c mod_roaming.c
do-install:
- ${APXS} -i -A -n roaming ${WRKSRC}/mod_roaming.so
+ ${APXS} -i -n roaming ${WRKSRC}/mod_roaming.so
+ ${INSTALL_DATA} ${FILESDIR}/httpd.conf.${PORTNAME} ${PREFIX}/etc/apache/
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/mod_roaming
+ ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/mod_roaming/
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PORTNAME}/
.endfor
.endif
- ${CAT} ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/www/mod_roaming/files/httpd.conf.mod_roaming b/www/mod_roaming/files/httpd.conf.mod_roaming
new file mode 100644
index 000000000000..b55a57334b8d
--- /dev/null
+++ b/www/mod_roaming/files/httpd.conf.mod_roaming
@@ -0,0 +1,20 @@
+#
+# Example configuration for the mod_roaming module
+#
+# $FreeBSD$
+#
+
+LoadModule roaming_module libexec/apache/mod_roaming.so
+
+AddModule mod_roaming.c
+
+<IfModule mod_roaming.c>
+ RoamingAlias /roaming /usr/local/etc/apache/roaming
+
+ <Location /roaming>
+ AuthUserFile /usr/local/etc/apache/roaming-htpasswd
+ AuthType Basic
+ AuthName "Roaming Access"
+ require valid-user
+ </Location>
+</IfModule>
diff --git a/www/mod_roaming/pkg-message b/www/mod_roaming/pkg-message
index c1d3bf270a09..c700b771f874 100644
--- a/www/mod_roaming/pkg-message
+++ b/www/mod_roaming/pkg-message
@@ -1,13 +1,15 @@
************************************************************
-Please edit your apache.conf or httpd.conf to enable and
-setup this module, and you might also need to create an
-htpasswd file, if you introduce basic authentication.
+Please edit your Apache configuration file to enable and set
+up this module. You may also need to create an htpasswd
+file if you are going to use basic authentication.
-You can always refer to the useful documents held in
-${PREFIX}/share/doc/mod_roaming/, where ${PREFIX} is
-typically /usr/local.
+Look at the file ${PREFIX}/etc/apache/httpd.conf.mod_roaming
+and the documents held in ${PREFIX}/share/doc/mod_roaming/
+for indications on what to do.
-When it's done, do the following to take effect:
+(${PREFIX} is typically /usr/local)
+
+When it's all set up, do the following to take effect:
apachectl configtest (and correct any errors reported)
apachectl restart
diff --git a/www/mod_roaming/pkg-plist b/www/mod_roaming/pkg-plist
index a083fa817e1d..78a02ee60c59 100644
--- a/www/mod_roaming/pkg-plist
+++ b/www/mod_roaming/pkg-plist
@@ -1,6 +1,5 @@
+etc/apache/httpd.conf.mod_roaming
libexec/apache/mod_roaming.so
-@exec %D/sbin/apxs -e -A -n roaming %D/%F
-@unexec %D/sbin/apxs -e -A -n roaming %D/%F
%%PORTDOCS%%share/doc/mod_roaming/CHANGES
%%PORTDOCS%%share/doc/mod_roaming/INSTALL
%%PORTDOCS%%share/doc/mod_roaming/LICENSE
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 852f078d68cd..63abbc306bd7 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mod_ruby
PORTVERSION= ${VERSION}
+PORTREVISION= 1
CATEGORIES= www ruby
MASTER_SITES= http://www.modruby.net/archive/
DIST_SUBDIR= ruby
@@ -42,16 +43,17 @@ do-configure:
@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} Makefile.RB ${CONFIGURE_ARGS}
do-install:
- ${APXS} -i -A -n ruby ${WRKSRC}/mod_ruby.so
+ ${APXS} -i -n ruby ${WRKSRC}/mod_ruby.so
+ ${INSTALL_DATA} ${FILESDIR}/httpd.conf.${PORTNAME} ${PREFIX}/etc/apache/
.if !defined(NOPORTDOCS)
- ${MKDIR} ${RUBY_DOCDIR}/mod_ruby/ja
+ ${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
.for f in ${DOCS_EN}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby/
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
.endfor
.for f in ${DOCS_JA}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby/ja/
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
.endfor
.endif
- ${CAT} ${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/www/mod_ruby/files/httpd.conf.mod_ruby b/www/mod_ruby/files/httpd.conf.mod_ruby
new file mode 100644
index 000000000000..a4e24b799b46
--- /dev/null
+++ b/www/mod_ruby/files/httpd.conf.mod_ruby
@@ -0,0 +1,19 @@
+#
+# Example configuration for the mod_ruby module
+#
+# $FreeBSD$
+#
+
+LoadModule ruby_module libexec/apache/mod_ruby.so
+
+AddModule mod_ruby.c
+
+<IfModule mod_ruby.c>
+ AddHandler ruby-script .rb
+
+# Alias /ruby/ /usr/local/www/cgi-bin/
+# <Location /ruby/>
+# SetHandler ruby-script
+# Options ExecCGI
+# </Location>
+</IfModule>
diff --git a/www/mod_ruby/pkg-message b/www/mod_ruby/pkg-message
index a1b41cc59905..2d68bd0cfa7c 100644
--- a/www/mod_ruby/pkg-message
+++ b/www/mod_ruby/pkg-message
@@ -1,13 +1,14 @@
************************************************************
-Please edit your apache.conf or httpd.conf to enable and
-setup this module, and you might also need to create an
-htpasswd file, if you introduce basic authentication.
+Please edit your Apache configuration file to enable and set
+up this module.
-You can always refer to the useful documents held in
-${PREFIX}/share/doc/ruby/mod_ruby/, where ${PREFIX} is
-typically /usr/local.
+Look at the file ${PREFIX}/etc/apache/httpd.conf.mod_ruby
+and the documents held in ${PREFIX}/share/doc/ruby/mod_ruby/
+for indications on what to do.
-When it's done, do the following to take effect:
+(${PREFIX} is typically /usr/local)
+
+When it's all set up, do the following to take effect:
apachectl configtest (and correct any errors reported)
apachectl restart
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index dc06fc255171..6ab5f8031a73 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -1,6 +1,5 @@
+etc/apache/httpd.conf.mod_ruby
libexec/apache/mod_ruby.so
-@exec %D/sbin/apxs -e -A -n ruby %D/%F
-@unexec %D/sbin/apxs -e -A -n ruby %D/%F
%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ChangeLog
%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/README.en
%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/README.ja
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 04:14:35 +0000