aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2006-05-14 23:39:14 +0000
committerMaho Nakata <maho@FreeBSD.org>2006-05-14 23:39:14 +0000
commit04242e24def2973bd16bc3a59ad54ab41ef3d699 (patch)
tree276915711fbbf679db70b626cec44a4aaf583db8 /editors
parent5df51713c99f08b0079f26f2cbe5999e94ec8993 (diff)
downloadports-04242e24def2973bd16bc3a59ad54ab41ef3d699.tar.gz
ports-04242e24def2973bd16bc3a59ad54ab41ef3d699.zip
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/ooo-build/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 7ecfa782d4e4..2c42520b3e44 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -62,10 +62,6 @@ pre-configure:
@cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel
.endif
@cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=${OOOBUILD_TAG}
-<<<<<<< Makefile
-=======
- ${MKDIR} ${WRKSRC}/cairo/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CAIRO} ${WRKSRC}/cairo/download
->>>>>>> 1.9
@${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/
.if !defined(DEVELOPER_VER)
@${CP} ${WRKDIR}/${OOOBUILD}/src/go-oo-team.png ${WRKSRC}/default_images/sw/res