mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Improve plist generation.

Browse Source 
It fixes problems when you deinstall a port with $PREFIX != $(apxs -q
  prefix). Now plist is aware of real location of apache module.
This commit is contained in:
Clement Laforet 2004-07-11 09:43:17 +00:00
parent 5238e91085
commit c36c607e27
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=113383
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/apache2/Makefile.modules.3rd
View File

@ -79,17 +79,28 @@ AP_EXTRAS+= -I ${AP_INC}
AP_EXTRAS+= -L ${AP_LIB}
.endif
.if exists(${APXS})
APXS_PREFIX!= ${APXS} -q prefix
.else
APXS_PREFIX= ${APXS:S/\/sbin\/apxs//}
.endif
.if defined(AP_FAST_BUILD)
ap-gen-plist:
.if defined(AP_GENPLIST)
. if !exists(${PLIST})
@${ECHO} "===> Generating apache plist"
@${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST}
@${ECHO} "@cwd ${APXS_PREFIX}" > ${PLIST}
@${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
@${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST}
@${ECHO} "@cwd ${PREFIX}" >> ${PLIST}
. endif
.else
@${DO_NADA}
.endif
do-build: ap-gen-plist
@cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE}

13
www/apache20/Makefile.modules.3rd
View File

@ -79,17 +79,28 @@ AP_EXTRAS+= -I ${AP_INC}
AP_EXTRAS+= -L ${AP_LIB}
.endif
.if exists(${APXS})
APXS_PREFIX!= ${APXS} -q prefix
.else
APXS_PREFIX= ${APXS:S/\/sbin\/apxs//}
.endif
.if defined(AP_FAST_BUILD)
ap-gen-plist:
.if defined(AP_GENPLIST)
. if !exists(${PLIST})
@${ECHO} "===> Generating apache plist"
@${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST}
@${ECHO} "@cwd ${APXS_PREFIX}" > ${PLIST}
@${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
@${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST}
@${ECHO} "@cwd ${PREFIX}" >> ${PLIST}
. endif
.else
@${DO_NADA}
.endif
do-build: ap-gen-plist
@cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE}