From owner-svn-ports-head@FreeBSD.ORG  Fri Feb  7 13:17:48 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1F3874A8;
 Fri,  7 Feb 2014 13:17:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E2A391B08;
 Fri,  7 Feb 2014 13:17:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17DHlex025171;
 Fri, 7 Feb 2014 13:17:47 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17DHlR2025170;
 Fri, 7 Feb 2014 13:17:47 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201402071317.s17DHlR2025170@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Fri, 7 Feb 2014 13:17:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343236 - in head/net-p2p/minder: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 13:17:48 -0000

Author: miwi
Date: Fri Feb  7 13:17:47 2014
New Revision: 343236
URL: http://svnweb.freebsd.org/changeset/ports/343236
QAT: https://qat.redports.org/buildarchive/r343236/

Log:
  - Fix build
  - Add LICENSE
  
  PR:		185317
  Submitted by:	ports fury

Deleted:
  head/net-p2p/minder/files/patch-Makefile
Modified:
  head/net-p2p/minder/Makefile

Modified: head/net-p2p/minder/Makefile
==============================================================================
--- head/net-p2p/minder/Makefile	Fri Feb  7 13:12:37 2014	(r343235)
+++ head/net-p2p/minder/Makefile	Fri Feb  7 13:17:47 2014	(r343236)
@@ -7,44 +7,41 @@ CATEGORIES=	net-p2p
 MASTER_SITES=	http://www.alhem.net/project/minder/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A small network application for automatic maintenance of peer lists
+COMMENT=	Small network application for automatic maintenance of peer lists
 
-BROKEN=		Fails to link
+LICENSE=	GPLv2 # (or later)
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libSockets.a:${PORTSDIR}/net/Sockets
+LIB_DEPENDS=	libSockets.so:${PORTSDIR}/net/Sockets
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
+USE_GNOME=	libxml2
 USE_OPENSSL=	yes
-WITH_OPENSSL_BASE=	yes
 
-# ssl support
-CFLAGS+=	${PTHREAD_CFLAGS} -DHAVE_OPENSSL
+CFLAGS+=	-DHAVE_OPENSSL
+CPPFLAGS+=	$$(pkg-config --cflags libxml-2.0) \
+		-I${LOCALBASE}/include/Sockets -I${LOCALBASE}/include
+LDFLAGS+=	$$(pkg-config --libs libxml-2.0) \
+		-L${LOCALBASE}/lib
 
-PLIST_DIRS=	\
-		%%EXAMPLESDIR%%
-PLIST_FILES=	\
-		%%EXAMPLESDIR%%/minder.cfg \
-		bin/${PORTNAME}
+PORTEXAMPLES=	minder.cfg
+PLIST_FILES=	bin/minder
 
-NO_STAGE=	yes
 post-patch:
-# CXX safeness
-# CXXFLAGS safeness
-# SSL include safeness
-	@${REINPLACE_CMD} -E \
-		-e 's|-O2||' \
-		-e 's|g\+\+|${CXX}|' \
-		-e 's|^INCLUDE.+$$|INCLUDE=-I${OPENSSLINC} -I${LOCALBASE}/include/Sockets|' \
-		-e 's|^LIBS.+$$|LIBS=-L${OPENSSLLIB} ${PTHREAD_LIBS} -L${LOCALBASE}/lib \\|' \
-		${BUILD_WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -E \
-		-e 's|\(__sighandler_t\)||' \
-		${WRKSRC}/minder.cpp
+	@${REINPLACE_CMD} -e \
+		's|^CFLAGS|#CFLAGS| ; \
+		 s|^CPPFLAGS =|CPPFLAGS +=| ; \
+		 s|-L/usr/local/lib|$$(LDFLAGS)| ; \
+		 s|-luuid|| ; \
+		 s|-lpthread|-pthread| ; \
+		 s|g++|$$(CXX)|' ${BUILD_WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e \
+		's|(__sighandler_t)||' ${WRKSRC}/minder.cpp
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${FILESDIR}/minder.cfg.sample \
-		${EXAMPLESDIR}/minder.cfg
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} minder \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${FILESDIR} && ${INSTALL_DATA} minder.cfg.sample \
+		${STAGEDIR}${EXAMPLESDIR}/minder.cfg)
 
 .include <bsd.port.mk>