diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2003-08-16 05:58:52 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2003-08-16 05:58:52 +0000 |
| commit | 28f21f5f7df8cbf53fb9da32d8c8a95e41e4a384 (patch) | |
| tree | 08a5c76dcd4b38b9b2e7ba503bdc215bbe458196 /editors/openoffice.org-3-devel | |
| parent | 38c52c07aa88bdec4daded19306a94c1912274c5 (diff) | |
| download | ports-28f21f5f7df8cbf53fb9da32d8c8a95e41e4a384.tar.gz ports-28f21f5f7df8cbf53fb9da32d8c8a95e41e4a384.zip | |
a) sysui/oounix/office/gnome/gnomeint seems to be desappeared.
b) *everywhere* we do not need virtual framebuffer!
Notes
Notes:
svn path=/head/; revision=87021
Diffstat (limited to 'editors/openoffice.org-3-devel')
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 76f4ecf74f23..d2dfd2460a6c 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -38,7 +38,7 @@ PASTE?= /usr/bin/paste .include <bsd.port.pre.mk> -BROKEN= "Does not work yet, installation problems" +#BROKEN= "Does not work yet, installation problems" BUILD_NR= ${PORTVERSION} RELEASE_NR= 1.1 INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} @@ -111,9 +111,6 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant BUILD_DEPENDS+= ${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/Xft -.if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer -.endif LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ @@ -152,10 +149,6 @@ BUILD= dmake BUILD= dmake strip="true" .endif -.if !defined(DISPLAY) -DISPLAYHACK=localhost:1001 -.endif - CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-jdk-home=${JDKDIR} @@ -392,8 +385,8 @@ fix-kdewrappers: # ${WRKSRC}/../sysui/oounix/office/kde2/kdeint fix-gnomewrappers: - @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \ - ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint +# @${PERL} -pi -e 's|"Exec", "<progpath>/program/|"Exec", "${PREFIX}/bin/openoffice_${RELEASE_NR}-|' \ +# ${WRKSRC}/../sysui/oounix/office/gnome/gnomeint extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @@ -464,31 +457,13 @@ do-build: .endif .endif .endif -.if exists(${WRKDIR}/.Xvfb.pid) - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.endif -.if !defined(DISPLAY) - # - # This is a UGLY hack to not have to specify a X-Display. - # - ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 -.endif @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck .endif -.if !defined(DISPLAY) - @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.else - @cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ + @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' -.endif .if defined(LANG_PKGNAME) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ ${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANG_EXT}' @@ -503,22 +478,9 @@ pre-install: @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: -.if !defined(DISPLAY) - # - # UGLY hack to not have to specify a X-Display. - # - ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 - @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ - TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \ - ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.else @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ - TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ + TEMP=${WRKDIR} \ ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp -.endif install-user: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ |