kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Don't switch to www/apache20 to minimize changes to not break INDEX

Browse source 
- Introduce APACHE_COMPAT variable keep weak dependencies on APACHE_PORT
  working

make INDEX is still broken
This commit is contained in:
Clement Laforet 2005-09-19 08:57:43 +00:00
parent efc03b4ae3
commit 4a8a47415e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=143130
4 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
devel/portmk/Mk/bsd.apache.mk
View file

@ -16,6 +16,9 @@
# common*: common13, common20 and common21 # common*: common13, common20 and common21
# apr: deal with apr stuff ;-) # apr: deal with apr stuff ;-)
# #
.if defined(APACHE_COMPAT)
USE_APACHE=yes
.endif
# Print warnings # Print warnings
_ERROR_MSG= : Error from bsd.apache.mk. _ERROR_MSG= : Error from bsd.apache.mk.
@ -29,15 +32,16 @@ AP_PORT_IS_MODULE= YES
#### for backward compatibility #### for backward compatibility
.elif ${USE_APACHE:L} == yes .elif ${USE_APACHE:L} == yes
APXS= ${LOCALBASE}/sbin/apxs
. if defined(WITH_APACHE2) . if defined(WITH_APACHE2)
APACHE_PORT?= www/apache20 APACHE_PORT?= www/apache2
. else . else
APACHE_PORT?= www/apache13 APACHE_PORT?= www/apache13
. endif . endif
APXS?= ${LOCALBASE}/sbin/apxs APXS?= ${LOCALBASE}/sbin/apxs
.if !defined(APACHE_COMPAT)
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
.endif
#### End of backward compatibility #### End of backward compatibility
.else .else
@ -257,7 +261,7 @@ IGNORE= ${_ERROR_MSG} apache${AP_CUR_VERSION} is installed (or APACHE_PORT is d
APACHE_VERSION= ${AP_CUR_VERSION} APACHE_VERSION= ${AP_CUR_VERSION}
.else .else
AP_CUR_VERSION= none AP_CUR_VERSION= none
. if !defined(${APACHE_PORT}) . if !defined(APACHE_PORT)
#Fallback to smallest version... #Fallback to smallest version...
APACHE_VERSION= ${AP_VERSION:C/\+//} APACHE_VERSION= ${AP_VERSION:C/\+//}
. endif . endif
@ -277,7 +281,9 @@ IGNORE?= PREFIX must be egal to APXS_PREFIX.
AP_BUILDEXT= la AP_BUILDEXT= la
PLIST_SUB+= APACHEMODDIR="libexec/apache2" \ PLIST_SUB+= APACHEMODDIR="libexec/apache2" \
APACHEINCLUDEDIR="include/apache2" APACHEINCLUDEDIR="include/apache2"
APACHE_PORT= www/apache${APACHE_VERSION} # XXX We postpone www/apache2 => www/apache20 migration
#APACHE_PORT= www/apache${APACHE_VERSION}
APACHE_PORT= www/apache2
.elif ${APACHE_VERSION} == "21" .elif ${APACHE_VERSION} == "21"
AP_BUILDEXT= la AP_BUILDEXT= la
PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \ PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \

4
devel/portmk/Mk/bsd.port.mk
View file

@ -1343,7 +1343,7 @@ PERL= ${LOCALBASE}/bin/perl
.include "${DEVELMKDIR}/bsd.tcl.mk" .include "${DEVELMKDIR}/bsd.tcl.mk"
.endif .endif
.if defined(USE_APACHE) .if defined(USE_APACHE) || defined(APACHE_COMPAT)
.include "${DEVELMKDIR}/bsd.apache.mk" .include "${DEVELMKDIR}/bsd.apache.mk"
.endif .endif
@ -1763,7 +1763,7 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.include "${DEVELMKDIR}/bsd.tcl.mk" .include "${DEVELMKDIR}/bsd.tcl.mk"
.endif .endif
.if defined(USE_APACHE) .if defined(USE_APACHE) || defined(APACHE_COMPAT)
.include "${DEVELMKDIR}/bsd.apache.mk" .include "${DEVELMKDIR}/bsd.apache.mk"
.endif .endif

14
ports-mgmt/portmk/Mk/bsd.apache.mk
View file

@ -16,6 +16,9 @@
# common*: common13, common20 and common21 # common*: common13, common20 and common21
# apr: deal with apr stuff ;-) # apr: deal with apr stuff ;-)
# #
.if defined(APACHE_COMPAT)
USE_APACHE=yes
.endif
# Print warnings # Print warnings
_ERROR_MSG= : Error from bsd.apache.mk. _ERROR_MSG= : Error from bsd.apache.mk.
@ -29,15 +32,16 @@ AP_PORT_IS_MODULE= YES
#### for backward compatibility #### for backward compatibility
.elif ${USE_APACHE:L} == yes .elif ${USE_APACHE:L} == yes
APXS= ${LOCALBASE}/sbin/apxs
. if defined(WITH_APACHE2) . if defined(WITH_APACHE2)
APACHE_PORT?= www/apache20 APACHE_PORT?= www/apache2
. else . else
APACHE_PORT?= www/apache13 APACHE_PORT?= www/apache13
. endif . endif
APXS?= ${LOCALBASE}/sbin/apxs APXS?= ${LOCALBASE}/sbin/apxs
.if !defined(APACHE_COMPAT)
BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
.endif
#### End of backward compatibility #### End of backward compatibility
.else .else
@ -257,7 +261,7 @@ IGNORE= ${_ERROR_MSG} apache${AP_CUR_VERSION} is installed (or APACHE_PORT is d
APACHE_VERSION= ${AP_CUR_VERSION} APACHE_VERSION= ${AP_CUR_VERSION}
.else .else
AP_CUR_VERSION= none AP_CUR_VERSION= none
. if !defined(${APACHE_PORT}) . if !defined(APACHE_PORT)
#Fallback to smallest version... #Fallback to smallest version...
APACHE_VERSION= ${AP_VERSION:C/\+//} APACHE_VERSION= ${AP_VERSION:C/\+//}
. endif . endif
@ -277,7 +281,9 @@ IGNORE?= PREFIX must be egal to APXS_PREFIX.
AP_BUILDEXT= la AP_BUILDEXT= la
PLIST_SUB+= APACHEMODDIR="libexec/apache2" \ PLIST_SUB+= APACHEMODDIR="libexec/apache2" \
APACHEINCLUDEDIR="include/apache2" APACHEINCLUDEDIR="include/apache2"
APACHE_PORT= www/apache${APACHE_VERSION} # XXX We postpone www/apache2 => www/apache20 migration
#APACHE_PORT= www/apache${APACHE_VERSION}
APACHE_PORT= www/apache2
.elif ${APACHE_VERSION} == "21" .elif ${APACHE_VERSION} == "21"
AP_BUILDEXT= la AP_BUILDEXT= la
PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \ PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \

4
ports-mgmt/portmk/Mk/bsd.port.mk
View file

@ -1343,7 +1343,7 @@ PERL= ${LOCALBASE}/bin/perl
.include "${DEVELMKDIR}/bsd.tcl.mk" .include "${DEVELMKDIR}/bsd.tcl.mk"
.endif .endif
.if defined(USE_APACHE) .if defined(USE_APACHE) || defined(APACHE_COMPAT)
.include "${DEVELMKDIR}/bsd.apache.mk" .include "${DEVELMKDIR}/bsd.apache.mk"
.endif .endif
@ -1763,7 +1763,7 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.include "${DEVELMKDIR}/bsd.tcl.mk" .include "${DEVELMKDIR}/bsd.tcl.mk"
.endif .endif
.if defined(USE_APACHE) .if defined(USE_APACHE) || defined(APACHE_COMPAT)
.include "${DEVELMKDIR}/bsd.apache.mk" .include "${DEVELMKDIR}/bsd.apache.mk"
.endif .endif