From tkato432@yahoo.com  Mon Dec 30 21:04:09 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 883D9A59
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 30 Dec 2013 21:02:50 +0000 (UTC)
Received: from omta03.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id 33BA21F97
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 30 Dec 2013 21:02:50 +0000 (UTC)
Received: from coppermine.my.domain (ZT028061.ppp.dion.ne.jp [59.128.28.61])
	by omta03.auone-net.jp (au one net mail) with ESMTP id 52C641880083
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 31 Dec 2013 06:02:48 +0900 (JST)
Message-Id: <20131231054823.7f02075f79815d5a5f12daa4@yahoo.com>
Date: Tue, 31 Dec 2013 05:48:23 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: net-p2p/minder: Fix build

>Number:         185317
>Category:       ports
>Synopsis:       net-p2p/minder: Fix build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 30 21:10:02 UTC 2013
>Closed-Date:    Fri Feb 07 15:57:56 UTC 2014
>Last-Modified:  Fri Feb 07 15:57:56 UTC 2014
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build
- Add LICENSE

Remove file:
files/patch-Makefile

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net-p2p/minder/Makefile net-p2p/minder/Makefile
--- /usr/ports/net-p2p/minder/Makefile	2013-12-07 06:50:00.000000000 +0900
+++ net-p2p/minder/Makefile	2013-12-31 00:00:00.000000000 +0900
@@ -7,44 +7,41 @@
 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.conf)
 
 .include <bsd.port.mk>
diff -urN /usr/ports/net-p2p/minder/files/patch-Makefile net-p2p/minder/files/patch-Makefile
--- /usr/ports/net-p2p/minder/files/patch-Makefile	2013-11-06 21:48:39.000000000 +0900
+++ net-p2p/minder/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- Makefile.orig	Sun Sep 25 02:56:46 2005
-+++ Makefile	Sun Sep 25 02:57:16 2005
-@@ -6,7 +6,7 @@
- CPPFLAGS =	$(CFLAGS)
- 
- LIBS =		-L/usr/local/lib -lSockets \
--		-lssl -lcrypto -luuid -lpthread
-+		-lssl -lcrypto -lSockets
- 
- PROGS =		minder 
- all:		$(PROGS)
-@@ -21,7 +21,7 @@
- 		rm -f *.o *~ *.d slask $(PROGS)
- 
- install:	all
--		install --strip $(PROGS) /usr/local/bin
-+		@${BSD_INSTALL_PROGRAM} $(PROGS) /usr/local/bin
- 
- -include	*.d
- 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jan 23 15:46:03 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185317 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Thu Feb 6 16:07:23 UTC 2014 
State-Changed-Why:  
build fails: http://pkgdev.miwibox.org/latest-per-pkg/minder/2.0.2/ 
(check the date of the build log) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185317 

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185317: net-p2p/minder: Fix build
Date: Fri, 7 Feb 2014 19:00:00 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Fri__7_Feb_2014_19_00_00_+0900_9Z/PP7dIF3iYwlxo
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Here is the corrected patch.
 
 --Multipart=_Fri__7_Feb_2014_19_00_00_+0900_9Z/PP7dIF3iYwlxo
 Content-Type: text/x-diff;
  name="net-p2p_minder.diff"
 Content-Disposition: attachment;
  filename="net-p2p_minder.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/net-p2p/minder/Makefile net-p2p/minder/Makefile
 --- /usr/ports/net-p2p/minder/Makefile	2014-01-23 03:23:56.000000000 +0900
 +++ net-p2p/minder/Makefile	2014-02-07 18:00:00.000000000 +0900
 @@ -7,44 +7,41 @@
  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>
 diff -urN /usr/ports/net-p2p/minder/files/patch-Makefile net-p2p/minder/files/patch-Makefile
 --- /usr/ports/net-p2p/minder/files/patch-Makefile	2014-01-23 03:23:56.000000000 +0900
 +++ net-p2p/minder/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
 @@ -1,20 +0,0 @@
 ---- Makefile.orig	Sun Sep 25 02:56:46 2005
 -+++ Makefile	Sun Sep 25 02:57:16 2005
 -@@ -6,7 +6,7 @@
 - CPPFLAGS =	$(CFLAGS)
 - 
 - LIBS =		-L/usr/local/lib -lSockets \
 --		-lssl -lcrypto -luuid -lpthread
 -+		-lssl -lcrypto -lSockets
 - 
 - PROGS =		minder 
 - all:		$(PROGS)
 -@@ -21,7 +21,7 @@
 - 		rm -f *.o *~ *.d slask $(PROGS)
 - 
 - install:	all
 --		install --strip $(PROGS) /usr/local/bin
 -+		@${BSD_INSTALL_PROGRAM} $(PROGS) /usr/local/bin
 - 
 - -include	*.d
 - 
 
 --Multipart=_Fri__7_Feb_2014_19_00_00_+0900_9Z/PP7dIF3iYwlxo--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185317: commit references a PR
Date: Fri,  7 Feb 2014 13:17:55 +0000 (UTC)

 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>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Feb 7 15:57:56 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185317 
>Unformatted:
