From 83d97469cd2ab30c8ca40e9c622abaa3bfb26189 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Thu, 19 Dec 2013 13:32:54 +0000
Subject: Instead of using python2, use python2.7. This way we don't depend on
 lang/python2. While here stageify.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18964 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/libsoup/Makefile                          | 28 +++++++++++++------------
 devel/libsoup/files/patch-libsoup_tld-parser.py |  8 -------
 2 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 devel/libsoup/files/patch-libsoup_tld-parser.py

(limited to 'devel/libsoup')

diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 4e2ecd302..a48901a21 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -1,5 +1,5 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD: head/devel/libsoup/Makefile 313633 2013-03-08 10:51:34Z kwm $
+# $FreeBSD$
 #   $MCom$
 
 PORTNAME=	libsoup
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
 
 USE_XZ=		yes
-NO_STAGE=	yes
 
 .if !defined(REFERENCE_PORT)
 
@@ -25,7 +24,7 @@ USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomehier glib20 libxml2 ltverhack referencehack intltool
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_PYTHON_BUILD=	-2.7
 CONFIGURE_ARGS=	--disable-more-warnings
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -46,27 +45,30 @@ CONFIGURE_ARGS+=--without-gnome
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
+	 @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
+		${WRKSRC}/libsoup/tld-parser.py
 
 .if defined(SOUP_SLAVE)
 do-build:
 	cd ${WRKSRC}/libsoup && ${GMAKE} libsoup-gnome-2.4.la
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${PREFIX}/lib/
-	cd ${WRKSRC}/libsoup && ${GMAKE} install-libsoupgnomeincludeHEADERS
+	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.la ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/
+	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS
 .endif
 
 post-install:
 .if defined(SOUP_SLAVE)
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-	@${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
-		${PREFIX}/libdata/pkgconfig/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+	${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 .else
-	@${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
-	    	${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
+	${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
+		${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsoup*.so*
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libsoup/files/patch-libsoup_tld-parser.py b/devel/libsoup/files/patch-libsoup_tld-parser.py
deleted file mode 100644
index 5c2724dd1..000000000
--- a/devel/libsoup/files/patch-libsoup_tld-parser.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- libsoup/tld-parser.py.orig	2013-05-12 13:59:58.000000000 +0000
-+++ libsoup/tld-parser.py	2013-05-12 14:00:36.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- # Generate tld rules
- # Copyright (C) 2012 Red Hat, Inc.
-- 
cgit v1.2.3