Bug 185317 - net-p2p/minder: Fix build
Summary: net-p2p/minder: Fix build
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-30 21:10 UTC by tkato432
Modified: 2014-02-07 15:57 UTC (History)
0 users

See Also:


Attachments
file.diff (2.97 KB, patch)
2013-12-30 21:10 UTC, tkato432
no flags Details | Diff
net-p2p_minder.diff (2.97 KB, patch)
2014-02-07 10:00 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-30 21:10:02 UTC
- Fix build
- Add LICENSE

Remove file:
files/patch-Makefile
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2014-01-23 15:46:03 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-02-06 16:07:23 UTC
State Changed
From-To: open->feedback

build fails: http://pkgdev.miwibox.org/latest-per-pkg/minder/2.0.2/ 
(check the date of the build log)
Comment 3 tkato432 2014-02-07 10:00:00 UTC
Here is the corrected patch.
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-02-07 13:17:55 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"
Comment 5 Martin Wilke freebsd_committer freebsd_triage 2014-02-07 15:57:56 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!