sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix damage cause by commits of eadler and miwi

Browse source
This commit is contained in:
Timur I. Bakeyev 2012-05-03 22:55:40 +00:00
parent 1a65aa28d0
commit 2e62e3630f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295981
2 changed files with 45 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
databases/tdb/Makefile
View file

@ -18,6 +18,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= timur@FreeBSD.org
COMMENT= Trivial Database
LICENSE= GPLv3
CONFLICTS= *samba3[0-4]-3.*
USE_PYTHON_BUILD= yes
@ -27,7 +29,6 @@ WAF_TOOL= buildtools/bin/waf
CONFIGURE_SCRIPT= ${WAF_TOOL} configure
USE_GNOME= pkgconfig
LICENSE= GPLv3
MAKE_JOBS_SAFE= yes
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
@ -57,10 +58,12 @@ MAKE_ENV+= NOCOLOR=yes
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man
.if !defined(DISABLE_MAKE_JOBS)
.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER}
_MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
.endif
.if defined(WITH_PYTHON)
USE_PYTHON_RUN= yes
@ -74,9 +77,22 @@ CONFIGURE_ARGS+= --disable-python
ALL_TARGET= build
INSTALL_TARGET= install
.include <bsd.port.pre.mk>
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
post-patch:
@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
${WRKSRC}/wscript
${BUILD_WRKSRC}/wscript
# Use threading (or multiprocessing) but not thread (renamed in python 3+).
pre-configure:
@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
${ECHO_CMD}; \
${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
${ECHO_CMD}; \
${FALSE}; \
fi
pre-build:
.for man in ${MAN8}
@ -86,7 +102,7 @@ pre-build:
do-build:
@(cd ${BUILD_WRKSRC}; \
if ! ${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \
if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \
if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
${ECHO_MSG} "===> Compilation failed unexpectedly."; \
(${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
@ -95,6 +111,6 @@ do-build:
fi)
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install)
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install)
.include <bsd.port.mk>
.include <bsd.port.post.mk>

29
devel/talloc/Makefile
View file

@ -7,6 +7,8 @@
PORTNAME= talloc
PORTVERSION= 2.0.7
PORTREVISION= 0
PORTEPOCH= 0
CATEGORIES= devel
MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \
ftp://ca.samba.org/pub/%SUBDIR%/ \
@ -30,8 +32,8 @@ USE_GNOME= pkgconfig
MAKE_JOBS_SAFE= yes
PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig
PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${LOCALBASE}/;;}
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
OPTIONS= PYTHON "Python bindings" on
@ -46,14 +48,16 @@ PLIST_FILES= include/talloc.h \
CONFIGURE_ENV+= XSLTPROC="/usr/bin/true"
CONFIGURE_ENV+= NOCOLOR=yes
MAKE_ENV+= NOCOLOR=yes X11BASE=${LOCALBASE}
MAKE_ENV+= NOCOLOR=yes
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man --prefix=${LOCALBASE}
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man
.if !defined(DISABLE_MAKE_JOBS)
.if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE)
.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)
CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER}
_MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
.endif
.if defined(WITH_PYTHON)
USE_PYTHON_RUN= yes
@ -71,10 +75,23 @@ CONFIGURE_ARGS+= --disable-python
ALL_TARGET= build
INSTALL_TARGET= install
.include <bsd.port.pre.mk>
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
post-patch:
@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
${BUILD_WRKSRC}/wscript
# Use threading (or multiprocessing) but not thread (renamed in python 3+).
pre-configure:
@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
${ECHO_CMD}; \
${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
${ECHO_CMD}; \
${FALSE}; \
fi
pre-build:
.for man in ${MAN3}
@${MKDIR} ${BUILD_WRKSRC}/bin/default
@ -94,4 +111,4 @@ do-build:
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install)
.include <bsd.port.mk>
.include <bsd.port.post.mk>