Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Feb 2015 08:48:20 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379073 - in head/devel/libsearpc: . files
Message-ID:  <201502160848.t1G8mKQM094924@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Mon Feb 16 08:48:19 2015
New Revision: 379073
URL: https://svnweb.freebsd.org/changeset/ports/379073
QAT: https://qat.redports.org/buildarchive/r379073/

Log:
  devel/libsearpc: relocate python files
  
  PR:		196921
  Submitted by:	maintainer (Jingfeng Yan)

Added:
  head/devel/libsearpc/files/patch-configure.ac   (contents, props changed)
Modified:
  head/devel/libsearpc/Makefile
  head/devel/libsearpc/files/patch-Makefile.am
  head/devel/libsearpc/pkg-plist

Modified: head/devel/libsearpc/Makefile
==============================================================================
--- head/devel/libsearpc/Makefile	Mon Feb 16 08:12:16 2015	(r379072)
+++ head/devel/libsearpc/Makefile	Mon Feb 16 08:48:19 2015	(r379073)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libsearpc
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yan_jingfeng@yahoo.com
@@ -25,4 +26,22 @@ PATHFIX_MAKEFILEIN=	Makefile.am
 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>

Modified: head/devel/libsearpc/files/patch-Makefile.am
==============================================================================
--- head/devel/libsearpc/files/patch-Makefile.am	Mon Feb 16 08:12:16 2015	(r379072)
+++ head/devel/libsearpc/files/patch-Makefile.am	Mon Feb 16 08:48:19 2015	(r379073)
@@ -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
- 
- 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)
+--- Makefile.am.orig	2015-02-16 05:30:39 UTC
++++ Makefile.am
+@@ -22,8 +22,12 @@ install-data-local:
+ 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
  
  dist-hook:
  	git log -1 > $(distdir)/latest_commit

Added: head/devel/libsearpc/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libsearpc/files/patch-configure.ac	Mon Feb 16 08:48:19 2015	(r379073)
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2014-08-14 15:48:58 UTC
++++ configure.ac
+@@ -68,6 +68,16 @@ fi
+ 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

Modified: head/devel/libsearpc/pkg-plist
==============================================================================
--- head/devel/libsearpc/pkg-plist	Mon Feb 16 08:12:16 2015	(r379072)
+++ head/devel/libsearpc/pkg-plist	Mon Feb 16 08:48:19 2015	(r379073)
@@ -7,16 +7,17 @@ lib/libsearpc.a
 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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502160848.t1G8mKQM094924>