svn commit: r397932 - in head/editors: openoffice-4 openoffice-4/files openoffice-devel openoffice-devel/files

Don Lewis truckman at FreeBSD.org
Sat Sep 26 07:40:50 UTC 2015 

Author: truckman
Date: Sat Sep 26 07:40:47 2015
New Revision: 397932
URL: https://svnweb.freebsd.org/changeset/ports/397932

Log:
  Add Caladea and Carlito fonts.  They are metrically equivalent to some
  Microsoft fonts and the proper definitions within OpenOffice have been
  added so that they are recognized as such. [1]
  
  The Linux ports handle the mapping from the printeradmin command to the
  spadmin executable in the shell wrapper.  Do the same in the FreeBSD
  port rather than munging the printeradmin.desktop file.  Retain the
  spadmin link to the wrapper for backwards compatability.
  
  The setofficelang command went away a long time ago.  Remove it from
  the shell wrapper and remove the link.
  
  Exec the OpenOffice executables from the wrapper so that the shell for
  the wrapper doesn't hang around as an extra process until OpenOffice
  terminates.
  
  Nuke an extraneous shell continuation in the Makefile.
  
  Suggested by:	pfg [1]

Deleted:
  head/editors/openoffice-4/files/patch-sysui_desktop_menus_printeradmin.desktop
  head/editors/openoffice-devel/files/patch-sysui_desktop_menus_printeradmin.desktop
Modified:
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-4/files/openoffice-wrapper
  head/editors/openoffice-4/files/pkg-message.in
  head/editors/openoffice-devel/Makefile
  head/editors/openoffice-devel/files/openoffice-wrapper
  head/editors/openoffice-devel/files/pkg-message.in

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Sat Sep 26 07:35:21 2015	(r397931)
+++ head/editors/openoffice-4/Makefile	Sat Sep 26 07:40:47 2015	(r397932)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -91,6 +91,8 @@ RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
+		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
+		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
 
 AOOVERSION1=	4
@@ -402,7 +404,7 @@ do-install:
 	@cd ${STAGEDIR}${OOPATH}/program ; \
 		${ECHO_CMD} "stripping executables and shared libraries" ; \
 		${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
-			regview *.so* *.bin ; \
+			regview *.so* *.bin
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
@@ -415,8 +417,8 @@ do-install:
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
-	@cd ${STAGEDIR}${PREFIX}/bin; for i in sbase scalc sdraw \
-		setofficelang simpress smath spadmin swriter ; do \
+	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
+		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}

Modified: head/editors/openoffice-4/files/openoffice-wrapper
==============================================================================
--- head/editors/openoffice-4/files/openoffice-wrapper	Sat Sep 26 07:35:21 2015	(r397931)
+++ head/editors/openoffice-4/files/openoffice-wrapper	Sat Sep 26 07:40:47 2015	(r397932)
@@ -2,17 +2,16 @@
 #
 # $FreeBSD$
 
-oopath=%%OOPATH%%
 program=`echo $0 | sed -e 's|.*%%EXECBASE%%-||'`
 
 case $program in
 $0)
-	$oopath/program/soffice "$@"
+	exec %%OOPATH%%/program/soffice "$@"
 	;;
-setofficelang)
-	$oopath/basis-link/program/$program "$@"
+printeradmin)
+	exec %%OOPATH%%/program/spadmin
 	;;
 *)
-	$oopath/program/$program "$@"
+	exec %%OOPATH%%/program/$program "$@"
 	;;
 esac

Modified: head/editors/openoffice-4/files/pkg-message.in
==============================================================================
--- head/editors/openoffice-4/files/pkg-message.in	Sat Sep 26 07:35:21 2015	(r397931)
+++ head/editors/openoffice-4/files/pkg-message.in	Sat Sep 26 07:40:47 2015	(r397932)
@@ -22,13 +22,12 @@ There are some wrappers installed for fa
 to your PATH and you will be able to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
+%%PREFIX%%/bin/%%EXECBASE%%-printeradmin
 %%PREFIX%%/bin/%%EXECBASE%%-sbase
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
-%%PREFIX%%/bin/%%EXECBASE%%-setofficelang
-%%PREFIX%%/bin/%%EXECBASE%%-smath
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
-%%PREFIX%%/bin/%%EXECBASE%%-spadmin
+%%PREFIX%%/bin/%%EXECBASE%%-smath
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OpenOffice does need $LANG to be set to a suitable value.

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Sat Sep 26 07:35:21 2015	(r397931)
+++ head/editors/openoffice-devel/Makefile	Sat Sep 26 07:40:47 2015	(r397932)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-#PORTREVISION=	1
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	editors java
 MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@@ -93,6 +93,8 @@ RUN_DEPENDS=								\
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \
+		${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \
+		${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \
 		${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf
 
 AOOVERSION1=	4
@@ -414,7 +416,7 @@ do-install:
 	@cd ${STAGEDIR}${OOPATH}/program ; \
 		${ECHO_CMD} "stripping executables and shared libraries" ; \
 		${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \
-			regview *.so* *.bin ; \
+			regview *.so* *.bin
 	${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
 	${REINPLACE_CMD} \
 		-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
@@ -427,8 +429,8 @@ do-install:
 			${WRKDIR}/openoffice-wrapper
 	${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${STAGEDIR}${PREFIX}/bin/${EXECBASE}
-	@cd ${STAGEDIR}${PREFIX}/bin; for i in sbase scalc sdraw \
-		setofficelang simpress smath spadmin swriter ; do \
+	@cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \
+		simpress smath spadmin swriter ; do \
 			${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
 	done
 	${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}

Modified: head/editors/openoffice-devel/files/openoffice-wrapper
==============================================================================
--- head/editors/openoffice-devel/files/openoffice-wrapper	Sat Sep 26 07:35:21 2015	(r397931)
+++ head/editors/openoffice-devel/files/openoffice-wrapper	Sat Sep 26 07:40:47 2015	(r397932)
@@ -2,17 +2,16 @@
 #
 # $FreeBSD$
 
-oopath=%%OOPATH%%
 program=`echo $0 | sed -e 's|.*%%EXECBASE%%-||'`
 
 case $program in
 $0)
-	$oopath/program/soffice "$@"
+	exec %%OOPATH%%/program/soffice "$@"
 	;;
-setofficelang)
-	$oopath/basis-link/program/$program "$@"
+printeradmin)
+	exec %%OOPATH%%/program/spadmin
 	;;
 *)
-	$oopath/program/$program "$@"
+	exec %%OOPATH%%/program/$program "$@"
 	;;
 esac

Modified: head/editors/openoffice-devel/files/pkg-message.in
==============================================================================
--- head/editors/openoffice-devel/files/pkg-message.in	Sat Sep 26 07:35:21 2015	(r397931)
+++ head/editors/openoffice-devel/files/pkg-message.in	Sat Sep 26 07:40:47 2015	(r397932)
@@ -22,13 +22,12 @@ There are some wrappers installed for fa
 to your PATH and you will be able to use them.
 
 %%PREFIX%%/bin/%%EXECBASE%%
+%%PREFIX%%/bin/%%EXECBASE%%-printeradmin
 %%PREFIX%%/bin/%%EXECBASE%%-sbase
 %%PREFIX%%/bin/%%EXECBASE%%-scalc
 %%PREFIX%%/bin/%%EXECBASE%%-sdraw
-%%PREFIX%%/bin/%%EXECBASE%%-setofficelang
-%%PREFIX%%/bin/%%EXECBASE%%-smath
 %%PREFIX%%/bin/%%EXECBASE%%-simpress
-%%PREFIX%%/bin/%%EXECBASE%%-spadmin
+%%PREFIX%%/bin/%%EXECBASE%%-smath
 %%PREFIX%%/bin/%%EXECBASE%%-swriter
 
 OpenOffice does need $LANG to be set to a suitable value.

More information about the svn-ports-head mailing list