Attachment 149107 Details for Bug 194853 – diff from existing port

[patch] diff from existing port

file_194853.txt (text/plain), 2.47 KB, created by Jingfeng Yan on 2014-11-06 04:09:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jingfeng Yan

Created: 2014-11-06 04:09:43 UTC

Size: 2.47 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 26)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
>
> PORTNAME=	ccnet
> PORTVERSION=	3.1.4
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt devel
>
> MAINTAINER=	yan_jingfeng@yahoo.com
>@@ -41,10 +42,10 @@
> WWWDIR=		${PREFIX}/www/haiwen/seafile-server
>
> post-install:
>-	@${MKDIR} -m 0755 ${STAGEDIR}${WWWDIR}/seafile/bin
>-	${INSTALL} -m 0755  ${STAGEDIR}${PREFIX}/bin/ccnet-init \
>+	@${MKDIR} ${STAGEDIR}${WWWDIR}/seafile/bin
>+	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-init \
> 		${STAGEDIR}${WWWDIR}/seafile/bin/ccnet-init
>-	${INSTALL} -m 0755  ${STAGEDIR}${PREFIX}/bin/ccnet-server \
>+	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/ccnet-server \
> 		${STAGEDIR}${WWWDIR}/seafile/bin/ccnet-server
>
> .include <bsd.port.mk>
>Index: files/patch-lib_utils.c
>===================================================================
>--- files/patch-lib_utils.c	(revision 12)
>+++ files/patch-lib_utils.c	(working copy)
>@@ -16,7 +16,7 @@
>  #endif  /* ifdef WIN32 */
>
> -#ifdef __linux__
>-+#if defined(__linux__) || defined(__FreeBSD__)
>++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
>  /* read the link of /proc/123/exe and compare with `process_name' */
>  static int
>  find_process_in_dirent(struct dirent *dir, const char *process_name)
>@@ -26,7 +26,7 @@
> +#if defined(__linux__)
>      if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) {
> +#endif
>-+#if defined(__FreeBSD__)
>++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
> +    if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) {
> +#endif
>          return -1;
>@@ -38,7 +38,7 @@
>
> +/*
> + * Finally, we should not enforce to use /proc
>-+#ifdef __FreeBSD__
>++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
> +gboolean process_is_running (const char *process_name)
> +{
> +    //TODO
>Index: files/patch-net_common_getgateway.c
>===================================================================
>--- files/patch-net_common_getgateway.c	(revision 12)
>+++ files/patch-net_common_getgateway.c	(working copy)
>@@ -5,7 +5,7 @@
>  #endif
>
> -#ifdef BSD
>-+#ifdef __FreeBSD__
>++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
>  #undef USE_PROC_NET_ROUTE
>  #define USE_SOCKET_ROUTE
>  #undef USE_SYSCTL_NET_ROUTE

Actions: View | Diff

Attachments on bug 194853: 149107 | 149108 | 149117