From owner-freebsd-openoffice@FreeBSD.ORG Wed Jan 12 06:36:08 2005 Return-Path: Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0E9B16A4CE for ; Wed, 12 Jan 2005 06:36:08 +0000 (GMT) Received: from hotmail.com (bay16-f40.bay16.hotmail.com [65.54.186.90]) by mx1.FreeBSD.org (Postfix) with ESMTP id 987DC43D4C for ; Wed, 12 Jan 2005 06:36:08 +0000 (GMT) (envelope-from clcchu@hotmail.com) Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Tue, 11 Jan 2005 22:35:00 -0800 Message-ID: Received: from 210.6.198.160 by by16fd.bay16.hotmail.msn.com with HTTP; Wed, 12 Jan 2005 06:34:40 GMT X-Originating-IP: [210.6.198.160] X-Originating-Email: [clcchu@hotmail.com] X-Sender: clcchu@hotmail.com From: "Clarence Chu" To: freebsd-openoffice@FreeBSD.Org Date: Wed, 12 Jan 2005 14:34:40 +0800 Mime-Version: 1.0 Content-Type: text/plain; format=flowed X-OriginalArrivalTime: 12 Jan 2005 06:35:00.0623 (UTC) FILETIME=[D759D1F0:01C4F870] Subject: openoffice-1.1/Makefile Changes X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2005 06:36:09 -0000 hi there, would you consider the following changes to openoffice-1.1/Makefile be a more reasonable one? --- Makefile.orig Wed Jan 12 13:25:48 2005 +++ Makefile Wed Jan 12 14:29:20 2005 @@ -80,7 +80,7 @@ CODELINE= 645 RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} -EXECBASE= openoffice.org-${RELEASE_NR} +EXECBASE= openoffice-${RELEASE_NR} DIST_SUBDIR= openoffice1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' PACKAGE_BASENAME= OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel @@ -223,20 +223,21 @@ ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${PREFIX}/bin/${EXECBASE} - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb - @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sagenda + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-scalc + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sdraw + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-setup + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sfax + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-smath + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-simpress + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-spadmin + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sweb + @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-swriter @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > ${TMPPLIST } @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIS T} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} + @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d -empty | ${XA RGS} ${RMDIR} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/di r.tmp @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMP PLIST} @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} _________________________________________________________________ No masks required! Use MSN Messenger to chat with friends and family. http://go.msnserver.com/HK/25382.asp