Attachment #152987 for bug #196921

View | Details | Raw Unified | Return to bug 196921 | Differences between
Collapse All | Expand All




PORTNAME=	libsearpc
PORTVERSION=	3.0.0
PORTREVISION=	1
CATEGORIES=	devel
MAINTAINER=	yan_jingfeng@yahoo.com

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>




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




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




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

Return to bug 196921

Lines 2-7 Link Here

(-)Makefile (+19 lines)
2	PORTNAME= libsearpc	2	PORTNAME= libsearpc
3	PORTVERSION= 3.0.0	3	PORTVERSION= 3.0.0
		4	PORTREVISION= 1
4	CATEGORIES= devel	5	CATEGORIES= devel
5	MAINTAINER= yan_jingfeng@yahoo.com	6	MAINTAINER= yan_jingfeng@yahoo.com
Lines 25-28 Link Here
25	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
26	INSTALL_TARGET= install-strip	27	INSTALL_TARGET= install-strip
		28	HAIWENDIR= www/haiwen
		29	SEAFILE_SERVER= ${HAIWENDIR}/seafile-server
		30	SEALIB= ${SEAFILE_SERVER}/seafile/lib
		31
		32	SEAFILE_USERNAME?= www
		33	SEAFILE_GROUPNAME?= ${SEAFILE_USERNAME}
		34
		35	PLIST_SUB= SEAFILE_USERNAME=${SEAFILE_USERNAME} \
		36	SEAFILE_GROUPNAME=${SEAFILE_GROUPNAME} \
		37	SEAFILE_SERVER=${SEAFILE_SERVER} \
		38	HAIWENDIR=${HAIWENDIR}
		39
		40	post-install:
		41	@${MKDIR} ${STAGEDIR}${SEALIB}
		42	(cd ${STAGEDIR}${PREFIX}/lib && \
		43	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
		44	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
		45
27	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)files/patch-Makefile.am (-12 / +12 lines)
1	--- Makefile.am.orig 2014-08-14 11:48:58.000000000 -0400	1	--- Makefile.am.orig 2015-01-28 16:36:15.000000000 -0500
2	+++ Makefile.am 2014-09-06 03:15:27.906790580 -0400	2	+++ Makefile.am 2015-01-28 16:43:16.000000000 -0500
3	@@ -19,11 +19,7 @@	3	@@ -22,8 +22,12 @@
4	SUBDIRS = lib pysearpc ${MAKE_DEMO} tests	4	if MACOS
		5	sed -i '' -e "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
		6	else
		7	+if BSD
		8	+ ${SED} -i '' "s\|(DESTDIR)\|${PREFIX}\|g" $(pcfiles)
		9	+else
		10	${SED} -i "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
		11	endif
		12	+endif
5	install-data-local:
6	-if MACOS
7	- sed -i '' -e "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
8	-else
9	- ${SED} -i "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
10	-endif
11	+ ${SED} -i '' "s\|(DESTDIR)\|\|g" $(pcfiles)
12
13	dist-hook:	13	dist-hook:
14	git log -1 > $(distdir)/latest_commit	14	git log -1 > $(distdir)/latest_commit

Line 0 Link Here

(-)files/patch-configure.ac (+19 lines)
	1	--- configure.ac.orig 2015-01-28 16:36:35.000000000 -0500
	2	+++ configure.ac 2015-01-28 16:40:25.000000000 -0500
	3	@@ -68,6 +68,16 @@
	4	AM_CONDITIONAL([MACOS], [test "$bmac" = "yes"])
	5	AC_SUBST(MACOS)
	6
	7	+AC_MSG_CHECKING(for BSD)
	8	+
	9	+if test `uname \| grep -e BSD -e DragonFly \| wc -l` = "1"; then
	10	+ bbsd=true
	11	+ AC_MSG_RESULT(compile in BSD)
	12	+fi
	13	+
	14	+AM_CONDITIONAL([BSD], [test "$bbsd" = "true"])
	15	+AC_SUBST(BSD)
	16	+
	17	# Checks for libraries.
	18
	19	GLIB_REQUIRED=2.26.0

Lines 7-22 Link Here

(-)pkg-plist (-12 / +13 lines)
7	lib/libsearpc.so	7	lib/libsearpc.so
8	lib/libsearpc.so.1	8	lib/libsearpc.so.1
9	lib/libsearpc.so.1.0.2	9	lib/libsearpc.so.1.0.2
10	%%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
11	%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyc
12	%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyo
13	%%PYTHON_SITELIBDIR%%/pysearpc/client.py
14	%%PYTHON_SITELIBDIR%%/pysearpc/client.pyc
15	%%PYTHON_SITELIBDIR%%/pysearpc/client.pyo
16	%%PYTHON_SITELIBDIR%%/pysearpc/common.py
17	%%PYTHON_SITELIBDIR%%/pysearpc/common.pyc
18	%%PYTHON_SITELIBDIR%%/pysearpc/common.pyo
19	%%PYTHON_SITELIBDIR%%/pysearpc/server.py
20	%%PYTHON_SITELIBDIR%%/pysearpc/server.pyc
21	%%PYTHON_SITELIBDIR%%/pysearpc/server.pyo
22	libdata/pkgconfig/libsearpc.pc	10	libdata/pkgconfig/libsearpc.pc
		11	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
		12	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyc
		13	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyo
		14	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.py
		15	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.pyc
		16	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.pyo
		17	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.py
		18	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.pyc
		19	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.pyo
		20	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.py
		21	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.pyc
		22	%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.pyo
		23	@dir(%%SEAFILE_USERNAME%%,%%SEAFILE_GROUPNAME%%,755) %%HAIWENDIR%%