gusibsd

Untitled

Apr 16th, 2014
102
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.27 KB | None | 0 0
  1. Index: pydbus-common/Makefile
  2. ===================================================================
  3. --- pydbus-common/Makefile (revision 19539)
  4. +++ pydbus-common/Makefile (working copy)
  5. @@ -4,41 +4,40 @@
  6.  
  7. PORTNAME= dbus
  8. PORTVERSION= 1.1.1
  9. -PORTREVISION= 3
  10. +PORTREVISION= 4
  11. CATEGORIES= devel gnome python
  12. MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
  13. -PKGNAMEPREFIX= py
  14. -PKGNAMESUFFIX= -common
  15. +PKGNAMEPREFIX?= py
  16. +PKGNAMESUFFIX?= -common
  17. DISTNAME= dbus-python-${PORTVERSION}
  18.  
  19. MAINTAINER= [email protected]
  20. -COMMENT= Common files for the Python bindings for the D-BUS messaging system
  21. +COMMENT?= Common files for the Python bindings for the D-BUS messaging system
  22.  
  23. BUILD_DEPENDS= dbus-glib>=0:${PORTSDIR}/devel/dbus-glib
  24.  
  25. +SLAVE_PORT?= no
  26. +
  27. USES= gettext pathfix pkgconfig gmake
  28. -USE_PYTHON_BUILD= 2
  29. USE_AUTOTOOLS= libtool
  30. CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
  31. CONFIGURE_ARGS= --docdir=${DOCSDIR} \
  32. --disable-api-docs
  33.  
  34. +.if ${SLAVE_PORT} == no
  35. +USE_PYTHON_BUILD= 2
  36. +
  37. DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
  38. EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}
  39.  
  40. -OPTIONS_DEFINE=HTMLDOCS
  41. +OPTIONS_SUB= yes
  42. +OPTIONS_DEFINE= HTMLDOCS
  43. HTMLDOCS_DESC= build html documentation
  44. +HTMLDOCS_CONFIGURE_OFF= --disable-html-docs
  45. +HTMLDOCS_BUILD_DEPENDS_ON= rst2html:${PORTSDIR}/textproc/py-docutils
  46.  
  47. .include <bsd.port.options.mk>
  48.  
  49. -.if ${PORT_OPTIONS:MHTMLDOCS}
  50. -BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils
  51. -PLIST_SUB+= HTML=""
  52. -.else
  53. -CONFIGURE_ARGS+=--disable-html-docs
  54. -PLIST_SUB+= HTML="@comment "
  55. -.endif
  56. -
  57. post-patch:
  58. .if ! ${PORT_OPTIONS:MDOCS}
  59. @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
  60. @@ -65,5 +64,23 @@
  61. ${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} && \
  62. ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
  63. .endif
  64. +.else # slave is defined
  65. +RUN_DEPENDS+= pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
  66. +USE_LDCONFIG= yes
  67. +.if ${SLAVE_PORT} == python2
  68. +USE_PYTHON= 2
  69. +.endif
  70. +.if ${SLAVE_PORT} == python3
  71. +USE_PYTHON= 3
  72. +.endif
  73.  
  74. +post-install:
  75. + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_dbus_*bindings.so
  76. +
  77. + @${RM} -f ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h \
  78. + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
  79. + @${RM} -f ${STAGEDIR}${DOCSDIR}/*
  80. + @${RMDIR} ${STAGEDIR}/${DOCSDIR}
  81. +.endif # end of slaving block
  82. +
  83. .include <bsd.port.mk>
  84. Index: pydbus-common/pkg-plist
  85. ===================================================================
  86. --- pydbus-common/pkg-plist (revision 19539)
  87. +++ pydbus-common/pkg-plist (working copy)
  88. @@ -1,17 +1,17 @@
  89. include/dbus-1.0/dbus/dbus-python.h
  90. libdata/pkgconfig/dbus-python.pc
  91. %%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt
  92. -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html
  93. +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html
  94. %%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
  95. -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html
  96. +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html
  97. %%PORTDOCS%%%%DOCSDIR%%/NEWS
  98. -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html
  99. +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html
  100. %%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt
  101. -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html
  102. +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html
  103. %%PORTDOCS%%%%DOCSDIR%%/README
  104. -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.html
  105. +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.html
  106. %%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
  107. -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
  108. +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
  109. %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py
  110. %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py
  111. %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py
  112. Index: py-dbus/Makefile
  113. ===================================================================
  114. --- py-dbus/Makefile (revision 19539)
  115. +++ py-dbus/Makefile (working copy)
  116. @@ -2,33 +2,16 @@
  117. # $FreeBSD$
  118. # $MCom$
  119.  
  120. -PORTNAME= dbus
  121. -PORTVERSION= 1.1.1
  122. -PORTREVISION= 1
  123. -CATEGORIES= devel gnome python
  124. -MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
  125. +PORTREVISION= 0
  126. +
  127. PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
  128. -DISTNAME= ${PORTNAME}-python-${PORTVERSION}
  129. +PKGNAMESUFFIX=
  130.  
  131. -MAINTAINER= [email protected]
  132. COMMENT= Python2 bindings for the D-BUS messaging system
  133.  
  134. -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
  135. -RUN_DEPENDS= pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
  136. +SLAVE_PORT= python2
  137.  
  138. -USES= gettext pathfix pkgconfig gmake
  139. -USE_PYTHON= 2
  140. -USE_AUTOTOOLS= libtool
  141. -CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
  142. -CONFIGURE_ARGS= --docdir=${DOCSDIR} \
  143. - --disable-api-docs
  144. +MASTERDIR= ${.CURDIR}/../../devel/pydbus-common
  145. +PLIST= ${.CURDIR}/pkg-plist
  146.  
  147. -post-install:
  148. - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_dbus_*bindings.so
  149. -
  150. - @${RM} -f ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h \
  151. - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
  152. - @${RM} -f ${STAGEDIR}${DOCSDIR}/*
  153. - @${RMDIR} ${STAGEDIR}/${DOCSDIR}
  154. -
  155. -.include <bsd.port.mk>
  156. +.include "${MASTERDIR}/Makefile"
  157. Index: py3-dbus/Makefile
  158. ===================================================================
  159. --- py3-dbus/Makefile (revision 19539)
  160. +++ py3-dbus/Makefile (working copy)
  161. @@ -2,32 +2,16 @@
  162. # $FreeBSD$
  163. # $MCom$
  164.  
  165. -PORTNAME= dbus
  166. -PORTVERSION= 1.1.1
  167. -CATEGORIES= devel gnome python
  168. -MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
  169. +PORTREVISION= 0
  170. +
  171. PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
  172. -DISTNAME= ${PORTNAME}-python-${PORTVERSION}
  173. +PKGNAMESUFFIX=
  174.  
  175. -MAINTAINER= [email protected]
  176. COMMENT= Python3 bindings for the D-BUS messaging system
  177.  
  178. -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
  179. -RUN_DEPENDS= pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
  180. +SLAVE_PORT= python3
  181.  
  182. -USES= gettext pathfix pkgconfig gmake
  183. -USE_PYTHON= 3
  184. -USE_AUTOTOOLS= libtool
  185. -CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
  186. -CONFIGURE_ARGS= --docdir=${DOCSDIR} \
  187. - --disable-api-docs
  188. +MASTERDIR= ${.CURDIR}/../../devel/pydbus-common
  189. +PLIST= ${.CURDIR}/pkg-plist
  190.  
  191. -post-install:
  192. - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_dbus_*bindings.so
  193. -
  194. - @${RM} -f ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h \
  195. - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
  196. - @${RM} -f ${STAGEDIR}${DOCSDIR}/*
  197. - @${RMDIR} ${STAGEDIR}/${DOCSDIR}
  198. -
  199. -.include <bsd.port.mk>
  200. +.include "${MASTERDIR}/Makefile"
Advertisement
Add Comment
Please, Sign In to add comment