diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-09-10 13:11:23 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-09-10 13:11:23 +0000 |
| commit | f57bc4af665126de839ff734a08e57726e84da84 (patch) | |
| tree | b47b12c2614f4db455f6a6733adce11a1cbba4b5 /cad/astk-serveur | |
| parent | ce4f70264ae0d02f294cd43745a43b45a8eb4a15 (diff) | |
| download | ports-f57bc4af665126de839ff734a08e57726e84da84.tar.gz ports-f57bc4af665126de839ff734a08e57726e84da84.zip | |
After an include, PLIST_SUB must be appended to, not overwritten.
If it is overwritten, many values will be clobbered, and
pain will ensue.
PR: 230864
Submitted by: mat
exp-runs by: antoine
Notes
Notes:
svn path=/head/; revision=479405
Diffstat (limited to 'cad/astk-serveur')
| -rw-r--r-- | cad/astk-serveur/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index 5f7a8f80ace8..1081eb6bbc89 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -62,7 +62,7 @@ WRKCONF= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration .if !defined(CLIENT_SEUL) WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV PATCHDIR= ${MASTERDIR}/files -PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\ +PLIST_SUB+= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\ vaster=${vaster} PATCH2RM= bin/as_run bin/parallel_cp etc/asrun etc/profile.sh \ asrun/config.py asrun/installation.py asrun/system.py \ @@ -90,7 +90,7 @@ TKPNG_VER= 0.9 TKPNG= tkpng${TKPNG_VER} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_CLIENT PATCHDIR= ${MASTERDIR}/files.client -PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster="" \ +PLIST_SUB+= ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster="" \ BWidget_DIR=${LINSTDIR}/ASTK_CLIENT/lib/BWidget-${BWidget_VER} PATCH2RM= bin/astk bin/bsf etc/astkrc/outils lib/init.tcl lib/tkselecteur.tcl .endif |