update to svn 1343442 and remove patches.
This commit is contained in:
Maho Nakata
parent
5112514a63
commit
d7687e13d0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=297647
@ -7,7 +7,6 @@
|
||||
|
||||
PORTNAME= apache-openoffice
|
||||
PORTVERSION= 3.4.${SVNREVISION}
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= editors java
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL}
|
||||
@ -57,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= 1340369
|
||||
SVNREVISION= 1343442
|
||||
INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION}
|
||||
EXECBASE?= openoffice-r${SVNREVISION}
|
||||
DIST_SUBDIR= openoffice
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
SHA256 (openoffice/ApacheOpenOffice.r1340369.tar.bz2) = 4ae7f8796fc431d859ec9e56d7d1955765cc93dd20b79455d2af40ec6f7e7161
|
||||
SIZE (openoffice/ApacheOpenOffice.r1340369.tar.bz2) = 251650050
|
||||
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1340369.tar.bz2) = a02caf168d96b18e310bd102ee35c1098e6d98205a7471e1a79801da6a949567
|
||||
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1340369.tar.bz2) = 223307883
|
||||
SHA256 (openoffice/ApacheOpenOffice.r1343442.tar.bz2) = 78ffa3551640d15b23537beb8dd06ac994a3253acc7a606904f9f34c35ee273c
|
||||
SIZE (openoffice/ApacheOpenOffice.r1343442.tar.bz2) = 251657502
|
||||
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1343442.tar.bz2) = 07ed07aa297ccfd476a2b9c20e482a45cfb35f6b875d914545768e27a7d9823c
|
||||
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1343442.tar.bz2) = 223305203
|
||||
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
|
||||
SIZE (openoffice/unowinreg.dll) = 6144
|
||||
|
||||
@ -1,187 +0,0 @@
|
||||
--- ../ext_libraries/apr/makefile.mk.orig 2012-03-05 00:28:09.000000000 -0800
|
||||
+++ ../ext_libraries/apr/makefile.mk 2012-05-18 00:06:26.000000000 -0700
|
||||
@@ -37,6 +37,8 @@
|
||||
TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
|
||||
TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1
|
||||
|
||||
+PATCH_FILES=apr-1.4.5.patch
|
||||
+
|
||||
.IF "$(OS)"=="WNT"
|
||||
|
||||
CONFIGURE_ACTION=cp include/apr.hw include/apr.h
|
||||
--- /dev/null 2012-05-21 23:57:08.000000000 -0700
|
||||
+++ ../ext_libraries/apr/apr-1.4.5.patch 2012-05-21 23:53:48.000000000 -0700
|
||||
@@ -0,0 +1,173 @@
|
||||
+--- misc/build/apr-1.4.5/configure.orig 2011-05-19 17:09:22.000000000 -0700
|
||||
++++ misc/build/apr-1.4.5/configure 2012-05-21 23:51:51.000000000 -0700
|
||||
+@@ -13468,7 +13468,7 @@
|
||||
+ hardcode_shlibpath_var=no
|
||||
+ ;;
|
||||
+
|
||||
+- freebsd1*)
|
||||
++ freebsd1.*)
|
||||
+ ld_shlibs=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -13484,7 +13484,7 @@
|
||||
+ ;;
|
||||
+
|
||||
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_direct=yes
|
||||
+ hardcode_minus_L=yes
|
||||
+@@ -14117,7 +14117,7 @@
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
||||
+
|
||||
+-freebsd1*)
|
||||
++freebsd1.*)
|
||||
+ dynamic_linker=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -14128,7 +14128,7 @@
|
||||
+ objformat=`/usr/bin/objformat`
|
||||
+ else
|
||||
+ case $host_os in
|
||||
+- freebsd[123]*) objformat=aout ;;
|
||||
++ freebsd[123].*) objformat=aout ;;
|
||||
+ *) objformat=elf ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+@@ -14146,7 +14146,7 @@
|
||||
+ esac
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ case $host_os in
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ freebsd3.[01]* | freebsdelf3.[01]*)
|
||||
+@@ -16199,7 +16199,7 @@
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+- freebsd[12]*)
|
||||
++ freebsd[12].*)
|
||||
+ # C++ shared libraries reported to be fairly broken before switch to ELF
|
||||
+ ld_shlibs_CXX=no
|
||||
+ ;;
|
||||
+@@ -17739,7 +17739,7 @@
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
||||
+
|
||||
+-freebsd1*)
|
||||
++freebsd1.*)
|
||||
+ dynamic_linker=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -17750,7 +17750,7 @@
|
||||
+ objformat=`/usr/bin/objformat`
|
||||
+ else
|
||||
+ case $host_os in
|
||||
+- freebsd[123]*) objformat=aout ;;
|
||||
++ freebsd[123].*) objformat=aout ;;
|
||||
+ *) objformat=elf ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+@@ -17768,7 +17768,7 @@
|
||||
+ esac
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ case $host_os in
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ freebsd3.[01]* | freebsdelf3.[01]*)
|
||||
+@@ -19717,7 +19717,7 @@
|
||||
+ hardcode_shlibpath_var_F77=no
|
||||
+ ;;
|
||||
+
|
||||
+- freebsd1*)
|
||||
++ freebsd1.*)
|
||||
+ ld_shlibs_F77=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -19733,7 +19733,7 @@
|
||||
+ ;;
|
||||
+
|
||||
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_direct_F77=yes
|
||||
+ hardcode_minus_L_F77=yes
|
||||
+@@ -20314,7 +20314,7 @@
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
||||
+
|
||||
+-freebsd1*)
|
||||
++freebsd1.*)
|
||||
+ dynamic_linker=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -20325,7 +20325,7 @@
|
||||
+ objformat=`/usr/bin/objformat`
|
||||
+ else
|
||||
+ case $host_os in
|
||||
+- freebsd[123]*) objformat=aout ;;
|
||||
++ freebsd[123].*) objformat=aout ;;
|
||||
+ *) objformat=elf ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+@@ -20343,7 +20343,7 @@
|
||||
+ esac
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ case $host_os in
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ freebsd3.[01]* | freebsdelf3.[01]*)
|
||||
+@@ -22288,7 +22288,7 @@
|
||||
+ hardcode_shlibpath_var_GCJ=no
|
||||
+ ;;
|
||||
+
|
||||
+- freebsd1*)
|
||||
++ freebsd1.*)
|
||||
+ ld_shlibs_GCJ=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -22304,7 +22304,7 @@
|
||||
+ ;;
|
||||
+
|
||||
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_direct_GCJ=yes
|
||||
+ hardcode_minus_L_GCJ=yes
|
||||
+@@ -22885,7 +22885,7 @@
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ ;;
|
||||
+
|
||||
+-freebsd1*)
|
||||
++freebsd1.*)
|
||||
+ dynamic_linker=no
|
||||
+ ;;
|
||||
+
|
||||
+@@ -22896,7 +22896,7 @@
|
||||
+ objformat=`/usr/bin/objformat`
|
||||
+ else
|
||||
+ case $host_os in
|
||||
+- freebsd[123]*) objformat=aout ;;
|
||||
++ freebsd[123].*) objformat=aout ;;
|
||||
+ *) objformat=elf ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+@@ -22914,7 +22914,7 @@
|
||||
+ esac
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ case $host_os in
|
||||
+- freebsd2*)
|
||||
++ freebsd2.*)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ freebsd3.[01]* | freebsdelf3.[01]*)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
--- oox/source/token/makefile.mk~ 2011-12-21 09:52:48.000000000 +0900
|
||||
+++ oox/source/token/makefile.mk 2011-12-25 13:12:55.000000000 +0900
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
.INCLUDE : target.mk
|
||||
.IF "$(GPERF)" == "" || !DEFINED $(GPERF)
|
||||
-GPERF=gperf
|
||||
+GPERF=/usr/local/bin/gperf
|
||||
.ENDIF
|
||||
|
||||
GENHEADERPATH = $(INCCOM)$/oox$/token
|
||||
@ -8,13 +8,3 @@
|
||||
))
|
||||
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
|
||||
$$(LDFLAGS) \
|
||||
@@ -204,4 +203,9 @@
|
||||
Xinerama Xrandr \
|
||||
))
|
||||
endif
|
||||
+ifeq ($(OS),FREEBSD)
|
||||
+$(eval $(call gb_Library_add_external_libs,vclplug_gen, \
|
||||
+ Xinerama Xrandr \
|
||||
+))
|
||||
+endif
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user