Attachment #152767 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




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
@exec install -d -o %%SEAFILE_USERNAME%% -g %%SEAFILE_GROUPNAME%% -m 755 %D/%%HAIWENDIR%%

Return to bug 196921

Lines 2-7 Link Here

(-)Makefile (+19 lines)
2		2
3	PORTNAME= libsearpc	3	PORTNAME= libsearpc
4	PORTVERSION= 3.0.0	4	PORTVERSION= 3.0.0
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= yan_jingfeng@yahoo.com	8	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
27		28
		29	HAIWENDIR= www/haiwen
		30	SEAFILE_SERVER= ${HAIWENDIR}/seafile-server
		31	SEALIB= ${SEAFILE_SERVER}/seafile/lib
		32
		33	SEAFILE_USERNAME?= www
		34	SEAFILE_GROUPNAME?= ${SEAFILE_USERNAME}
		35
		36	PLIST_SUB= SEAFILE_USERNAME=${SEAFILE_USERNAME} \
		37	SEAFILE_GROUPNAME=${SEAFILE_GROUPNAME} \
		38	SEAFILE_SERVER=${SEAFILE_SERVER} \
		39	HAIWENDIR=${HAIWENDIR}
		40
		41	post-install:
		42	@${MKDIR} ${STAGEDIR}${SEALIB}
		43	(cd ${STAGEDIR}${PREFIX}/lib && \
		44	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
		45	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
		46
28	.include <bsd.port.mk>	47	.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		13
6	install-data-local:
7	-if MACOS
8	- sed -i '' -e "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
9	-else
10	- ${SED} -i "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
11	-endif
12	+ ${SED} -i '' "s\|(DESTDIR)\|\|g" $(pcfiles)
13
14	dist-hook:	14	dist-hook:
15	git log -1 > $(distdir)/latest_commit	15	git log -1 > $(distdir)/latest_commit

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	@exec install -d -o %%SEAFILE_USERNAME%% -g %%SEAFILE_GROUPNAME%% -m 755 %D/%%HAIWENDIR%%