mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-22 08:58:47 +00:00
Update to svn 1294611.
This commit is contained in:
parent
72cb34ee50
commit
4ce72fe4cf
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=292399
@ -56,7 +56,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
|
||||
OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
|
||||
EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
|
||||
OOODIR= openoffice.org3
|
||||
SVNREVISION= 1291759
|
||||
SVNREVISION= 1294611
|
||||
INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION}
|
||||
EXECBASE?= openoffice-r${SVNREVISION}
|
||||
DIST_SUBDIR= openoffice
|
||||
@ -208,18 +208,15 @@ post-extract:
|
||||
|
||||
post-patch:
|
||||
.if defined (USE_GCC)
|
||||
${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
|
||||
${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
|
||||
@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
|
||||
@${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
|
||||
.else
|
||||
${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
|
||||
${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
|
||||
@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
|
||||
@${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
@${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip
|
||||
.if defined(WITH_KDE4)
|
||||
@${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc
|
||||
.endif
|
||||
|
||||
do-build:
|
||||
@cd ${WRKDIR}/ooo ; ${PRINTF} "[repositories]\n" > source_config
|
||||
@ -229,18 +226,18 @@ do-build:
|
||||
@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
|
||||
|
||||
do-install:
|
||||
cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
|
||||
${RM} -Rf ${WRKDIR}/tmp
|
||||
${MKDIR} ${WRKDIR}/tmp
|
||||
for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
|
||||
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
|
||||
@${RM} -Rf ${WRKDIR}/tmp
|
||||
@${MKDIR} ${WRKDIR}/tmp
|
||||
@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
|
||||
${ECHO_CMD} "extracting $$i" ; \
|
||||
cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \
|
||||
done
|
||||
${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
|
||||
cd ${WRKDIR}/tmp/OO*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
|
||||
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
|
||||
@cd ${WRKDIR}/tmp/OO*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
|
||||
|
||||
${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
|
||||
cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
|
||||
@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
|
||||
@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
|
||||
|
||||
post-install:
|
||||
@${ECHO_MSG} "===> Add wrapper scripts";
|
||||
|
@ -1,6 +1,6 @@
|
||||
SHA256 (openoffice/ApacheOpenOffice.r1291759.tar.bz2) = d7a7304fc8c587929f4d54e94a1a7dc8f33a30ff9b344cc34d96aa5efa464ebd
|
||||
SIZE (openoffice/ApacheOpenOffice.r1291759.tar.bz2) = 250910112
|
||||
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1291759.tar.bz2) = 9e7dd6861fca4fc83e91ee7891ab1a64849d1d92ff4a0f7a2c7821296eb2e601
|
||||
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1291759.tar.bz2) = 215139737
|
||||
SHA256 (openoffice/ApacheOpenOffice.r1294611.tar.bz2) = af7248bc08190051bc9a4027a7a43621b93b3ad8fb31493d40557b76a3910192
|
||||
SIZE (openoffice/ApacheOpenOffice.r1294611.tar.bz2) = 250895196
|
||||
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1294611.tar.bz2) = b3cbee4a68c46f60a697ae9d3a44151b1ca3a154d44ccf07fa5515e0cd1ccd4f
|
||||
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1294611.tar.bz2) = 215139860
|
||||
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
|
||||
SIZE (openoffice/unowinreg.dll) = 6144
|
||||
|
12
editors/openoffice-3-devel/files/patch-apr
Normal file
12
editors/openoffice-3-devel/files/patch-apr
Normal file
@ -0,0 +1,12 @@
|
||||
--- ../ext_libraries/apr/prj/d.lst 2012-02-27 20:07:36.000000000 +0900
|
||||
+++ ../ext_libraries/apr/prj/d.lst 2012-02-27 20:07:44.000000000 +0900
|
||||
@@ -16,7 +16,9 @@
|
||||
|
||||
# Linux
|
||||
..\%__SRC%\lib\libapr-1.so.*.* %_DEST%\lib%_EXT%
|
||||
+..\%__SRC%\lib\libapr-1.so.* %_DEST%\lib%_EXT%
|
||||
linklib: libapr-1.so.*.*
|
||||
+linklib: libapr-1.so.*
|
||||
|
||||
# Mac
|
||||
..\%__SRC%\lib\libapr-1.*dylib %_DEST%\lib%_EXT%
|
12
editors/openoffice-3-devel/files/patch-aprutil
Normal file
12
editors/openoffice-3-devel/files/patch-aprutil
Normal file
@ -0,0 +1,12 @@
|
||||
--- ../ext_libraries/apr-util/prj/d.lst 2012-02-27 20:08:44.000000000 +0900
|
||||
+++ ../ext_libraries/apr-util/prj/d.lst 2012-02-27 20:08:52.000000000 +0900
|
||||
@@ -8,7 +8,9 @@
|
||||
|
||||
# Linux
|
||||
..\%__SRC%\lib\libaprutil-1.so.*.* %_DEST%\lib%_EXT%
|
||||
+..\%__SRC%\lib\libaprutil-1.so.* %_DEST%\lib%_EXT%
|
||||
linklib: libaprutil-1.so.*.*
|
||||
+linklib: libaprutil-1.so.*
|
||||
|
||||
# Mac
|
||||
..\%__SRC%\lib\libaprutil-1.*dylib %_DEST%\lib%_EXT%
|
29
editors/openoffice-3-devel/files/patch-scp2
Normal file
29
editors/openoffice-3-devel/files/patch-scp2
Normal file
@ -0,0 +1,29 @@
|
||||
--- scp2/source/ooo/file_library_ooo.scp 2012-02-26 13:38:09.000000000 +0900
|
||||
+++ scp2/source/ooo/file_library_ooo.scp 2012-02-28 21:04:25.000000000 +0900
|
||||
@@ -2006,6 +2006,8 @@
|
||||
// part of the suffix. An error?
|
||||
#ifdef MACOSX
|
||||
Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
|
||||
+ #elif FREEBSD
|
||||
+ Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.4));
|
||||
#else
|
||||
Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
|
||||
#endif
|
||||
@@ -2021,6 +2023,8 @@
|
||||
// part of the suffix. An error?
|
||||
#ifdef MACOSX
|
||||
Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
|
||||
+ #elif FREEBSD
|
||||
+ Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.4));
|
||||
#else
|
||||
Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
|
||||
#endif
|
||||
@@ -2036,6 +2040,8 @@
|
||||
// part of the suffix. An error?
|
||||
#ifdef MACOSX
|
||||
Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
|
||||
+ #elif FREEBSD
|
||||
+ Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
|
||||
#else
|
||||
Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
|
||||
#endif
|
10
editors/openoffice-3-devel/files/patch-serf
Normal file
10
editors/openoffice-3-devel/files/patch-serf
Normal file
@ -0,0 +1,10 @@
|
||||
--- ../ext_libraries/serf/prj/d.lst 2012-02-26 13:47:28.000000000 +0900
|
||||
+++ ../ext_libraries/serf/prj/d.lst 2012-02-28 10:24:47.000000000 +0900
|
||||
@@ -7,5 +7,6 @@
|
||||
|
||||
# Linux, BSD, et al
|
||||
..\%__SRC%\lib\libserf-1.so.*.* %_DEST%\lib%_EXT%
|
||||
+..\%__SRC%\lib\libserf-1.so.* %_DEST%\lib%_EXT%
|
||||
linklib: libserf-1.so.*.*
|
||||
-
|
||||
+linklib: libserf-1.so.*
|
Loading…
Reference in New Issue
Block a user