Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/www/ap2-auth-mellon/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/ap2-auth-mellon/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pkgsrc/www/ap2-auth-mellon/Makefile	2010/05/31 16:46:30	1.13
+++ pkgsrc/www/ap2-auth-mellon/Makefile	2011/03/18 09:48:54	1.14
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/05/31 16:46:30 manu Exp $
+# $NetBSD: Makefile,v 1.14 2011/03/18 09:48:54 obache Exp $
 #
 
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/}
@@ -9,6 +9,9 @@ MASTER_SITES=	http://modmellon.googlecod
 MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/modmellon/
 COMMENT=	SAML 2.0 authentication for Apache
+LICENSE=	gnu-gpl-v2 # or later
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
@@ -16,19 +19,23 @@ USE_TOOLS+=	pkg-config
 
 APACHE_MODULE=	YES
 APACHE_MODULE_NAME=	auth_mellon_module
-PKG_APACHE_ACCEPTED=    apache22
+PKG_APACHE_ACCEPTED=	apache22
 .include "../../mk/apache.mk"
-BUILDLINK_API_DEPENDS.apache+=  apache>=2.0.47
-
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.openssl}/include/openssl
-OPENSSL_LIBS=	-L${PREFIX}/lib -lssl -lcrypto
-
-CONFIGURE_ENV+=		PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
-CONFIGURE_ENV+=		OPENSSL_CFLAGS=${CPPFLAGS:Q}
-CONFIGURE_ENV+=		OPENSSL_LIBS=${OPENSSL_LIBS:Q}
-CONFIGURE_ARGS+=        --with-apxs2=${APXS:Q}
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
-# url2pkg-marker (please do not remove this line.)
+SUBST_CLASSES+=		pthflags
+SUBST_MESSAGES=		Convert -pthread flag to apxs style
+SUBST_STAGE.pthflags=	post-configure
+SUBST_FILES.pthflags=	Makefile
+SUBST_SED.pthflags=	-e 's| -pthread | ${"${PTHREAD_CFLAGS:M-pthread}":?-Wc,-pthread:} ${"${PTHREAD_LDFLAGS:M-pthread}":?-Wl,-pthread:} |g'
+
+INSTALLATION_DIRS+=	lib/httpd
+
+do-install:
+	cd ${WRKSRC} &&							\
+	    libexecdir=`${APXS} -q LIBEXECDIR` &&			\
+	    ${APXS} -i -S LIBEXECDIR=${DESTDIR}"$${libexecdir}" 	\
+	      -n auth_mellon  mod_auth_mellon.la
 
 .include "../../security/lasso/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"