[Bsd-sharp-cvs] CVS commit to /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono by tmclau02

[noreply at forge.novell.com]

CVS commit to /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono by tmclau02

Modified Files:
	Makefile pkg-plist 
Log Message:
- Fix packaging issues so stuff installs correctly based on the version
  of apache installed.
- Try and fix apache22 issues by using configure script from SVN.  Still
  broken but it appears to be closer to working now.

===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono/Makefile	2006/04/12 03:18:40	1.26
+++ /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono/Makefile	2006/06/18 01:41:55	1.27
@@ -3,11 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh at sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.26 2006/04/12 03:18:40 tmclau02 Exp $
+#   $Id: Makefile,v 1.27 2006/06/18 01:41:55 tmclau02 Exp $
 #
 
 PORTNAME=	mod_mono
 PORTVERSION=	1.1.13
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.go-mono.com/sources/${PORTNAME}/
 
@@ -19,26 +20,21 @@
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
 		xsp:${PORTSDIR}/www/xsp
 
-USE_APACHE=	yes
+USE_APACHE=	1.3+
 USE_GNOME=	gnometarget
 USE_AUTOTOOLS=	libtool:15
 
 MAN8=		mod_mono.8
 
-OPTIONS=	APACHE2 "Use Apache 2 " off
-
 .include <bsd.port.pre.mk>
-
-.if defined(WITH_APACHE2)
-PLIST_SUB+=	APACHE=2
-APACHE_CONF=	apache2
+.if ${APACHE_VERSION} == 13
+MOD_MONOCONFDIR=${APACHEETCDIR}
 .else
-PLIST_SUB+=	APACHE=
-APACHE_CONF=	apache
+MOD_MONOCONFDIR=${APACHEETCDIR}/Includes
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's|%%APACHE_CONF%%|${PREFIX}/etc/${APACHE_CONF}|g' \
+	@${REINPLACE_CMD} 's|%%MOD_MONOCONFDIR%%|${PREFIX}/etc/${MOD_MONOCONFDIR}|g' \
 		${WRKSRC}/Makefile.in
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono/pkg-plist,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono/pkg-plist	2005/10/22 22:38:22	1.6
+++ /cvsroot/bsd-sharp/FreeBSD-ports/www/mod_mono/pkg-plist	2006/06/18 01:41:55	1.7
@@ -1,4 +1,2 @@
-etc/apache%%APACHE%%/mod_mono.conf
-libexec/apache%%APACHE%%/mod_mono.so
- at unexec %D/sbin/apxs -e -A -n mono %D/%F
- at exec %D/sbin/apxs -e -A -n mono %D/%F
+%%MOD_MONOCONFDIR%%/mod_mono.conf
+%%APACHEMODDIR%%/mod_mono.so