[Midnightbsd-cvs] mports: Makefile: Create an openoffice.org24 script that *should* work

[laffer1 at midnightbsd.org]

Log Message:
-----------
Create an openoffice.org24 script that *should* work with the menus.

Modified Files:
--------------
    mports/editors/linux-openoffice2:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/linux-openoffice2/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L editors/linux-openoffice2/Makefile -L editors/linux-openoffice2/Makefile -u -r1.5 -r1.6
--- editors/linux-openoffice2/Makefile
+++ editors/linux-openoffice2/Makefile
@@ -7,8 +7,8 @@
 
 PORTNAME=	openoffice2
 PORTVERSION=	${OO_RELEASE}
-PORTREVISION=	2
-CATEGORIES=	editors java  linux 
+PORTREVISION=	3
+CATEGORIES=	editors java linux 
 MASTER_SITES=	${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
 PKGNAMEPREFIX?=	linux-
 DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
@@ -28,10 +28,10 @@
 		xi xt xcursor xdamage xcomposite xfixes 
 NO_BUILD=	yes
 
-OO_VER=			2.4
-OO_RELEASE=		2.4.0
+OO_VER=		2.4
+OO_RELEASE=	2.4.0
 
-RPM2CPIO?=	 		${LOCALBASE}/bin/rpm2cpio
+RPM2CPIO?=	${LOCALBASE}/bin/rpm2cpio
 BUILD_DEPENDS+=	${RPM2CPIO}:${PORTSDIR}/archivers/rpm
 RC_CMD?=			${RPM2CPIO}
 RC_AFTER_ARGS?=	| ${CPIO} -id --quiet
@@ -144,7 +144,9 @@
 	${LN} -sf ${PREFIX}/openoffice.org${OO_VER}/share/xdg/printeradmin.desktop ${PREFIX}/share/applications/openoffice.org${OO_VER}-printeradmin.desktop
 	${LN} -sf ${PREFIX}/openoffice.org${OO_VER}/share/xdg/writer.desktop ${PREFIX}/share/applications/openoffice.org${OO_VER}-writer.desktop
 	${LN} -sf ${PREFIX}/openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice 
-	${LN} -sf ${PREFIX}/openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/openoffice.org${OO_VER}
+	${REINPLACE_CMD} "s,/etc,${TRUE_PREFIX}," \
+		${WRKDIR}/oo/usr/bin/openoffice.org${OO_VER}
+	${INSTALL} ${WRKDIR}/oo/usr/bin/openoffice.org${OO_VER} ${PREFIX}/bin/
 .for i in scalc sdraw simpress swriter
 	${LN} -sf ${PREFIX}/openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}
 .endfor