aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING8
-rw-r--r--editors/staroffice60/Makefile8
-rw-r--r--editors/staroffice70/Makefile8
-rw-r--r--german/staroffice70/Makefile8
4 files changed, 20 insertions, 12 deletions
diff --git a/UPDATING b/UPDATING
index 394f4337057f..ce32e955f471 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,14 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20060612:
+ AFFECTS: users of editors/staroffice60, editors/staroffice70 and
+ german/staroffice70
+ AUTHOR: erwin@FreeBSD.org
+
+ The USE_CDROM knob was renamed to WITH_CDROM for consistency
+ within the ports tree.
+
20060611:
AFFECTS: users of www/c-icap
AUTHOR: b3k@mail.ru
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 2d470a6345eb..61c130b4c303 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \
ftp://ftp.uga.edu/pub/unix/sun/patches/:patch \
ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
DISTNAME= so-6_0-ga-bin-linux-en.bin
-.if !defined(USE_CDROM)
+.if !defined(WITH_CDROM)
DISTFILES= so-6_0-ga-bin-linux-en.bin 112887-04.tar:patch
.endif
.if defined(WITH_ADABAS)
@@ -109,7 +109,7 @@ pre-fetch:
@${ECHO} WITH_ADABAS=YES.
@${ECHO}
.endif
-.if defined(USE_CDROM)
+.if defined(WITH_CDROM)
DLTEST=112887-04.tar
.else
.if exists(/cdrom/linux/office60/setup)
@@ -118,7 +118,7 @@ DLTEST=112887-04.tar
@${ECHO} mounted on ${CD_MOUNTPT}. If you wish to install from
@${ECHO} this CD-ROM, please run
@${ECHO}
- @${ECHO} make USE_CDROM=YES
+ @${ECHO} make WITH_CDROM=YES
@${ECHO}
@${ECHO} Otherwise please unmount the CD-ROM.
@${ECHO}
@@ -139,7 +139,7 @@ post-extract:
@ ${FALSE}
.else
@${MKDIR} ${WRKSRC}
-.if defined(USE_CDROM)
+.if defined(WITH_CDROM)
@ln -sf /cdrom/linux/office60/* ${WRKSRC}
.else
@${MKDIR} ${TMPDIR}
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index b838b84b697b..b47431e55365 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://patches.sun.com/patchroot/all_unsigned/:patch \
ftp://ftp.uga.edu/pub/unix/sun/patches/:patch \
ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
DISTNAME= so-7-ga-bin-linux-en.bin
-.if !defined(USE_CDROM)
+.if !defined(WITH_CDROM)
DISTFILES= so-7-ga-bin-linux-en.bin 116518-08.tar:patch
.else
DISTFILES= 116518-08.tar:patch
@@ -120,7 +120,7 @@ pre-fetch:
@${ECHO}
@${FALSE}
.endif
-.if defined(USE_CDROM)
+.if defined(WITH_CDROM)
DLTEST=116518-08.tar
.else
.if exists(/cdrom/linux/office7/setup)
@@ -129,7 +129,7 @@ DLTEST=116518-08.tar
@${ECHO} mounted on ${CD_MOUNTPT}. If you wish to install from
@${ECHO} this CD-ROM, please run
@${ECHO}
- @${ECHO} make USE_CDROM=YES
+ @${ECHO} make WITH_CDROM=YES
@${ECHO}
@${ECHO} Otherwise please unmount the CD-ROM.
@${ECHO}
@@ -150,7 +150,7 @@ post-extract:
@ ${FALSE}
.else
@${MKDIR} ${WRKSRC}
-.if defined(USE_CDROM)
+.if defined(WITH_CDROM)
@ln -sf /cdrom/linux/office7/* ${WRKSRC}
@${MKDIR} ${TMPDIR}
.else
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index f28bebaaa221..5d4c57c3a7c2 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://patches.sun.com/patchroot/all_unsigned/:patch \
ftp://ftp.uga.edu/pub/unix/sun/patches/:patch \
ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch
DISTNAME= so-7-ga-bin-linux-de.bin
-.if !defined(USE_CDROM)
+.if !defined(WITH_CDROM)
DISTFILES= so-7-ga-bin-linux-de.bin 116518-08.tar:patch
.else
DISTFILES= 116518-08.tar:patch
@@ -120,7 +120,7 @@ pre-fetch:
@${ECHO}
@${FALSE}
.endif
-.if defined(USE_CDROM)
+.if defined(WITH_CDROM)
DLTEST=116518-08.tar
.else
.if exists(/cdrom/linux/office7/setup)
@@ -129,7 +129,7 @@ DLTEST=116518-08.tar
@${ECHO} mounted on ${CD_MOUNTPT}. If you wish to install from
@${ECHO} this CD-ROM, please run
@${ECHO}
- @${ECHO} make USE_CDROM=YES
+ @${ECHO} make WITH_CDROM=YES
@${ECHO}
@${ECHO} Otherwise please unmount the CD-ROM.
@${ECHO}
@@ -150,7 +150,7 @@ post-extract:
@ ${FALSE}
.else
@${MKDIR} ${WRKSRC}
-.if defined(USE_CDROM)
+.if defined(WITH_CDROM)
@ln -sf /cdrom/linux/office7/* ${WRKSRC}
@${MKDIR} ${TMPDIR}
.else