aboutsummaryrefslogtreecommitdiff
path: root/german
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2001-12-28 10:36:58 +0000
committerMartin Blapp <mbr@FreeBSD.org>2001-12-28 10:36:58 +0000
commit81b530e55aaf17fdc84ba6b519491aa6b5c61878 (patch)
treefe35f08b846ab5c9e87a6ba3434466cbc7e3995a /german
parent43c7b739f81b60ff5ae0f62d5f34a3a026f1a1ba (diff)
downloadports-81b530e55aaf17fdc84ba6b519491aa6b5c61878.tar.gz
ports-81b530e55aaf17fdc84ba6b519491aa6b5c61878.zip
Hardcode another /cdrom, since the define is not overwritten by the
PRE section. Install the patches too for a WITH_CDROM installation. Approved by: demon
Notes
Notes: svn path=/head/; revision=52321
Diffstat (limited to 'german')
-rw-r--r--german/staroffice52/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 61baa96b83aa..2a2a6b5a79c9 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -91,7 +91,7 @@ pre-fetch:
@ ${ECHO}
.endif
.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
+.if !exists(/cdrom/linux/office52/setup)
@${ECHO}
@${ECHO} Bitte mounten Sie die Sun StarOffice 5.2 CDROM
@${ECHO} nach ${CD_MOUNTPT} and starten Sie make erneut.
@@ -171,13 +171,11 @@ do-install:
${ECHO} ; \
${FALSE} ; \
fi
-.if ! defined(WITH_CDROM)
@${ECHO_MSG} "===> Applying sunsolve patches for ${PKGNAME}"
@for file in ${SUNSOLVE}/* ; do \
${CP} -Rv $$file ${PREFIX}/office52/ ; \
done
.endif
-.endif
post-install:
@${PATCH} -s ${PREFIX}/office52/program/setup ${FILESDIR}/setup.patch