Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31476
Modified Files: javascript-common.info Log Message: Update for upcoming apache 2.4 Index: javascript-common.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/javascript-common.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- javascript-common.info 4 Jul 2012 20:56:48 -0000 1.1 +++ javascript-common.info 8 Aug 2013 15:07:43 -0000 1.2 @@ -1,6 +1,6 @@ Package: javascript-common Version: 7 -Revision: 1 +Revision: 2 ### Suggests: apache2 ### @@ -28,6 +28,7 @@ case "${1}" in configure) + ### Apache 2.2 mkdir -p %p/etc/apache2/conf.d if [ ! -e %p/etc/apache2/conf.d/javascript-common.conf ] @@ -35,6 +36,18 @@ ln -s %p/etc/javascript-common/javascript-common.conf %p/etc/apache2/conf.d/javascript-common.conf fi + ### Apache 2.4 + mkdir -p %p/etc/apache2/conf-available + + if [ ! -e %p/etc/apache2/conf-available/javascript-common.conf ] + then + ln -s %p/etc/javascript-common/javascript-common.conf %p/etc/apache2/conf-available/javascript-common.conf + if which a2enconf >/dev/null 2>&1 + then + a2enconf javascript-common + fi + fi + if which apache2ctl >/dev/null 2>&1 then apache2ctl restart @@ -57,11 +70,22 @@ PostRmScript: << set -e +### Apache 2.2 if [ -L %p/etc/apache2/conf.d/javascript-common.conf ] then rm -f %p/etc/apache2/conf.d/javascript-common.conf fi +### Apache 2.4 +if [ -L %p/etc/apache2/conf-available/javascript-common.conf ] +then + if which a2disconf >/dev/null 2>&1 + then + a2disconf javascript-common + fi + rm -f %p/etc/apache2/conf-available/javascript-common.conf +fi + if which apache2ctl >/dev/null 2>&1 then apache2ctl restart ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs