Attachment 139125 Details for Bug 185317 – net-p2p_minder.diff

[patch] net-p2p_minder.diff

net-p2p_minder.diff (text/x-diff), 2.97 KB, created by tkato432 on 2014-02-07 10:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-02-07 10:00:00 UTC

Size: 2.97 KB

patch

obsolete

>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
>-

Actions: View | Diff

Attachments on bug 185317: 139124 | 139125