summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/libreoffice3-bin/Makefile11
-rw-r--r--misc/libreoffice3-bin/distinfo8
2 files changed, 7 insertions, 12 deletions
diff --git a/misc/libreoffice3-bin/Makefile b/misc/libreoffice3-bin/Makefile
index db539be2fe8..81bd9f54cff 100644
--- a/misc/libreoffice3-bin/Makefile
+++ b/misc/libreoffice3-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/08/26 13:25:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2012/10/01 13:27:01 ryoon Exp $
DISTNAME= libreoffice3-bin # overridden below
PKGNAME= libreoffice3-bin-${OO_RELEASE}
@@ -21,7 +21,7 @@ CONFLICTS+= openoffice-linux-[0-9]*
OO_VER= 3
OO_BASEVER= 3.6
-OO_RELEASE= 3.6.0
+OO_RELEASE= 3.6.1
PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
MESSAGE_SUBST+= VER=${OO_VER:Q}
FILES_SUBST+= VER=${OO_VER:Q}
@@ -48,18 +48,13 @@ RUN_LDCONFIG= no
USE_TOOLS+= patch
-BUILD_DEPENDS+= binpatch-[0-9]*:../../pkgtools/binpatch
-
-FIND_PREFIX:= BINPATCHDIR=binpatch
-.include "../../mk/find-prefix.mk"
-
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
.if ${EMUL_PLATFORM} == "linux-i386"
DISTNAME= LibO_${OO_RELEASE}_Linux_x86_install-rpm_en-US
-WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}.4_Linux_x86_install-rpm_en-US
+WRKSRC= ${WRKDIR}/LibO_${OO_RELEASE}.2_Linux_x86_install-rpm_en-US
.elif ${EMUL_PLATFORM} == "solaris-i386"
DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US
WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
diff --git a/misc/libreoffice3-bin/distinfo b/misc/libreoffice3-bin/distinfo
index a38399456ec..02f05343713 100644
--- a/misc/libreoffice3-bin/distinfo
+++ b/misc/libreoffice3-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2012/08/26 13:25:14 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2012/10/01 13:27:01 ryoon Exp $
-SHA1 (LibO_3.6.0_Linux_x86_install-rpm_en-US.tar.gz) = d7eb268a544119d11953913c24d876809cd29087
-RMD160 (LibO_3.6.0_Linux_x86_install-rpm_en-US.tar.gz) = f4ced587ba930ea4d9d39ff70193bd5c9a71a2cc
-Size (LibO_3.6.0_Linux_x86_install-rpm_en-US.tar.gz) = 167658097 bytes
+SHA1 (LibO_3.6.1_Linux_x86_install-rpm_en-US.tar.gz) = 3659d211c22847cc2b56c3d751cbbec993cdf608
+RMD160 (LibO_3.6.1_Linux_x86_install-rpm_en-US.tar.gz) = ed5df45913bc23c536fb552419c9c359601a0f23
+Size (LibO_3.6.1_Linux_x86_install-rpm_en-US.tar.gz) = 167736433 bytes