mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00
Code Issues Releases Activity

- cleanup APACHE version check

Browse Source 
- bump PORTREVISION
This commit is contained in:
Olli Hauer 2013-07-06 09:03:04 +00:00
parent c558c6bdea
commit 2b14975a72
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=322371
6 changed files with 30 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/subversion/Makefile.common
View File

@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= 1.8.0
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \
${MASTER_SITE_LOCAL:S/$/:book/}
@ -56,7 +56,7 @@ PLIST_SUB+= BDB="@comment "
.endif
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
WITH_APACHE= yes
USE_APACHE= 22+
CONFIGURE_ARGS+=--with-apxs=${APXS} --with-apache-libexecdir
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
@ -70,21 +70,9 @@ SVNGROUP?= svn
SVNUSER?= svn
.endif
.if defined(WITH_APACHE)
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.if ${APACHE_VERSION} > 20
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.else
IGNORE= please update to apache22
.endif
.else
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.endif
CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}

2
devel/subversion16/Makefile
View File

@ -60,7 +60,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.if ${PORT_OPTIONS:MENHANCED_KEYWORD}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword
.endif
.if ${PORT_OPTIONS:MFREEBSD_TEMPLATe}
.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
.endif

16
devel/subversion16/Makefile.common
View File

@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.5/:book
@ -67,7 +67,7 @@ PLIST_SUB+= BDB="@comment "
.endif
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
WITH_APACHE= yes
USE_APACHE= 22+
CONFIGURE_ARGS+=--with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
@ -87,21 +87,9 @@ SVNGROUP?= svn
SVNUSER?= svn
.endif
.if defined(WITH_APACHE)
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.if ${APACHE_VERSION} > 20
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.else
IGNORE= please update to apache22
.endif
.else
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.endif
CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}

68
devel/subversion17/Makefile
View File

@ -27,21 +27,21 @@ OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE \
OPTIONS_DEFAULT=P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON
P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
BOOK_DESC= Install the Subversion Book
ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
GNOME_KEYRING_DESC= Build with GNOME Keyring auth support
KDE_KWALLET_DESC= Build with KDE KWallet auth support
MAINTAINER_DEBUG_DESC= Build debug version
MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X
MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X
NEON_DESC= WebDAV/Delta-V repo access module (neon)
P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
SERF_DESC= WebDAV/Delta-V repo access module (serf)
MAINTAINER_DEBUG_DESC= Build debug version
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper
SVNMUCC_DESC= Install Multiple URL Command Client
SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate
STATIC_DESC= Build static version (no shared libs)
GNOME_KEYRING_DESC= Build with GNOME Keyring auth support
KDE_KWALLET_DESC= Build with KDE KWallet auth support
BOOK_DESC= Install the Subversion Book
SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate
SVNMUCC_DESC= Install Multiple URL Command Client
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)
TEST_DESC= Run subversion test suite
.include "Makefile.common"
@ -54,7 +54,7 @@ SVNFSTYPE?= fsfs
SUB_FILES= pkg-install \
pkg-deinstall
BOOK_VERSION= 4304
BOOK_VERSION= 4515
.if make(repository)
WITH_REPOSITORY_CREATION= yes
@ -133,42 +133,6 @@ LIB_DEPENDS=
pre-everything::
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MNEON}
@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
.else
@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MBDB}
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
.else
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled."
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
@${ECHO_MSG} "Build debug version."
@${ECHO_MSG} ""
.endif
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
.else
@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled."
.else
@${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X"
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${ECHO_MSG} "svnserve wrapper enabled."
@${ECHO_MSG} ""
.endif
.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
@${ECHO_MSG} "svnauthz-validate enabled."
@${ECHO_MSG} ""
.endif
.if defined(WITH_REPOSITORY_CREATION)
@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
@${ECHO_MSG} "Make sure that all committers are its members."
@ -191,10 +155,6 @@ pre-everything::
@${ECHO_MSG} "Subversion Book will be installed."
@${ECHO_MSG} ""
.endif
#.if ${PORT_OPTIONS:MASVN}
# @${ECHO_MSG} "asvn will be installed"
# @${ECHO_MSG} ""
#.endif
.if ${PORT_OPTIONS:MSTATIC}
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@ -264,16 +224,16 @@ post-install: ${MKREPOS_TARGET}
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
. if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
. endif
.endif
.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
${LIBTOOL} --mode=install ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin
.endif
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/tools ; \
${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf -
${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude '*.la' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf -
# ugly hack to remove libtool scripts ...
@${GREP} -R ${WRKSRC} ${DATADIR} | ${CUT} -d\: -f 1 | ${XARGS} ${RM} -f
@${CHMOD} -R a-st,o+rX ${DATADIR}
@ -282,10 +242,10 @@ post-install: ${MKREPOS_TARGET}
for f in ${TXT_DOCS}; do \
${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
done
.if ${PORT_OPTIONS:MBOOK}
. if ${PORT_OPTIONS:MBOOK}
${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR}
${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}/svn-book.pdf
.endif
. endif
.endif
.if ${PORT_OPTIONS:MASVN}
${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin

26
devel/subversion17/Makefile.common
View File

@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= 1.7.10
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \
${MASTER_SITE_LOCAL:S/$/:book/}
@ -22,7 +22,7 @@ LICENSE= AL2
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]*
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}17${PKGNAMESUFFIX}
LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 \
expat:${PORTSDIR}/textproc/expat2
CONFIGURE_ARGS+= --with-ssl \
@ -41,7 +41,7 @@ OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be inclu
# Default is "on"
.if ${PORT_OPTIONS:MNEON}
LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
LIB_DEPENDS+= neon:${PORTSDIR}/www/neon29
PLIST_SUB+= NEON=""
.else
CONFIGURE_ARGS+=--without-neon
@ -71,17 +71,17 @@ IGNORE= to build mod_dontdothat option mod_dav_svn is required
.endif
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
WITH_APACHE= yes
USE_APACHE= 22+
CONFIGURE_ARGS+=--with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
SVNUSER?= www
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
. if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
PLIST_SUB+= MOD_DONTDOTHAT=""
.else
. else
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
.endif
. endif
.else
CONFIGURE_ARGS+=--with-apxs=no
PLIST_SUB+= MOD_DAV_SVN="@comment "
@ -91,21 +91,9 @@ SVNGROUP?= svn
SVNUSER?= svn
.endif
.if defined(WITH_APACHE)
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.if ${APACHE_VERSION} > 20
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.else
IGNORE= please update to apache22
.endif
.else
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.endif
CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}

8
devel/subversion17/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (subversion17/subversion-1.7.10.tar.bz2) = c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7
SIZE (subversion17/subversion-1.7.10.tar.bz2) = 5952121
SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14
SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806
SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2
SIZE (subversion17/svn-book-r4304.pdf) = 1921443
SHA256 (subversion17/svn-book-html-r4515.tar.bz2) = 666cef147abc9b917a6bb6527da4f4869221d793126289c715f002bfb2baa508
SIZE (subversion17/svn-book-html-r4515.tar.bz2) = 473182
SHA256 (subversion17/svn-book-r4515.pdf) = 962d524ae2c861ec48a45723c484f4f5e1826ee2f9ccfe58b07b96af67b0bf5e
SIZE (subversion17/svn-book-r4515.pdf) = 1943481