Attachment 152987 Details for Bug 196921 – unified diff

[patch] unified diff

file_196921.txt (text/plain), 4.63 KB, created by Jingfeng Yan on 2015-02-14 22:05:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jingfeng Yan

Created: 2015-02-14 22:05:48 UTC

Size: 4.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378668)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
>
> PORTNAME=	libsearpc
> PORTVERSION=	3.0.0
>+PORTREVISION=	1
> CATEGORIES=	devel
>
> MAINTAINER=	yan_jingfeng@yahoo.com
>@@ -25,4 +26,22 @@
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>
>+HAIWENDIR=	www/haiwen
>+SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
>+SEALIB=		${SEAFILE_SERVER}/seafile/lib
>+
>+SEAFILE_USERNAME?=	www
>+SEAFILE_GROUPNAME?=	${SEAFILE_USERNAME}
>+
>+PLIST_SUB=	SEAFILE_USERNAME=${SEAFILE_USERNAME} \
>+		SEAFILE_GROUPNAME=${SEAFILE_GROUPNAME} \
>+		SEAFILE_SERVER=${SEAFILE_SERVER} \
>+		HAIWENDIR=${HAIWENDIR}
>+
>+post-install:
>+	@${MKDIR} ${STAGEDIR}${SEALIB}
>+	(cd ${STAGEDIR}${PREFIX}/lib && \
>+		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
>+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
>+
> .include <bsd.port.mk>
>Index: files/patch-Makefile.am
>===================================================================
>--- files/patch-Makefile.am	(revision 378668)
>+++ files/patch-Makefile.am	(working copy)
>@@ -1,15 +1,15 @@
>---- Makefile.am.orig	2014-08-14 11:48:58.000000000 -0400
>-+++ Makefile.am	2014-09-06 03:15:27.906790580 -0400
>-@@ -19,11 +19,7 @@
>- SUBDIRS = lib pysearpc ${MAKE_DEMO} tests
>+--- Makefile.am.orig	2015-01-28 16:36:15.000000000 -0500
>++++ Makefile.am	2015-01-28 16:43:16.000000000 -0500
>+@@ -22,8 +22,12 @@
>+ if MACOS
>+ 	sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
>+ else
>++if BSD
>++	${SED} -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles)
>++else
>+ 	${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
>+ endif
>++endif
>
>- install-data-local:
>--if MACOS
>--	sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
>--else
>--	${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
>--endif
>-+	${SED} -i '' "s|(DESTDIR)||g" $(pcfiles)
>-
>  dist-hook:
>  	git log -1 > $(distdir)/latest_commit
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(revision 0)
>+++ files/patch-configure.ac	(working copy)
>@@ -0,0 +1,19 @@
>+--- configure.ac.orig	2015-01-28 16:36:35.000000000 -0500
>++++ configure.ac	2015-01-28 16:40:25.000000000 -0500
>+@@ -68,6 +68,16 @@
>+ AM_CONDITIONAL([MACOS], [test "$bmac" = "yes"])
>+ AC_SUBST(MACOS)
>+
>++AC_MSG_CHECKING(for BSD)
>++
>++if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then
>++  bbsd=true
>++  AC_MSG_RESULT(compile in BSD)
>++fi
>++
>++AM_CONDITIONAL([BSD], [test "$bbsd" = "true"])
>++AC_SUBST(BSD)
>++
>+ # Checks for libraries.
>+
>+ GLIB_REQUIRED=2.26.0
>
>Property changes on: files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 378668)
>+++ pkg-plist	(working copy)
>@@ -7,16 +7,17 @@
> lib/libsearpc.so
> lib/libsearpc.so.1
> lib/libsearpc.so.1.0.2
>-%%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
>-%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/pysearpc/client.py
>-%%PYTHON_SITELIBDIR%%/pysearpc/client.pyc
>-%%PYTHON_SITELIBDIR%%/pysearpc/client.pyo
>-%%PYTHON_SITELIBDIR%%/pysearpc/common.py
>-%%PYTHON_SITELIBDIR%%/pysearpc/common.pyc
>-%%PYTHON_SITELIBDIR%%/pysearpc/common.pyo
>-%%PYTHON_SITELIBDIR%%/pysearpc/server.py
>-%%PYTHON_SITELIBDIR%%/pysearpc/server.pyc
>-%%PYTHON_SITELIBDIR%%/pysearpc/server.pyo
> libdata/pkgconfig/libsearpc.pc
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyc
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyo
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.py
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.pyc
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.pyo
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.py
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.pyc
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.pyo
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.py
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.pyc
>+%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.pyo
>+@dir(%%SEAFILE_USERNAME%%,%%SEAFILE_GROUPNAME%%,755) %%HAIWENDIR%%

Actions: View | Diff

Attachments on bug 196921: 151882 | 152222 | 152223 | 152224 | 152767 | 152768 | 152987