From owner-freebsd-ports Thu Oct 8 22:30:18 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA25679 for freebsd-ports-outgoing; Thu, 8 Oct 1998 22:30:18 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA25555 for ; Thu, 8 Oct 1998 22:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id WAA21030; Thu, 8 Oct 1998 22:30:00 -0700 (PDT) Received: (from nobody@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA25092; Thu, 8 Oct 1998 22:26:31 -0700 (PDT) (envelope-from nobody) Message-Id: <199810090526.WAA25092@hub.freebsd.org> Date: Thu, 8 Oct 1998 22:26:31 -0700 (PDT) From: taoka@infonets.hiroshima-u.ac.jp To: freebsd-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: www-1.0 Subject: ports/8224: Update: print/yatex Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 8224 >Category: ports >Synopsis: Update: print/yatex >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 8 22:30:00 PDT 1998 >Last-Modified: >Originator: Satoshi Taoka >Organization: Hiroshima Univ. in Japan >Release: 3.0-19980928-BETA >Environment: >Description: Update print/yatex because port of mule-2.3 is updated and its install directory is changed from /usr/local/lib to /usr/local/share. >How-To-Repeat: >Fix: diff -aruN print/yatex.org/Makefile print/yatex/Makefile --- print/yatex.org/Makefile Fri Aug 14 09:16:07 1998 +++ print/yatex/Makefile Fri Oct 9 14:24:31 1998 @@ -1,6 +1,6 @@ # New ports collection makefile for: YaTeX # Version required: 1.65.6 -# Date created: 18 Feb. 1998 +# Date created: Oct 9 1998 # Whom: Satoshi Taoka # # $Id: Makefile,v 1.1.1.1 1998/08/14 00:16:07 kuriyama Exp $ @@ -36,7 +36,8 @@ \\t\\"${ELISPDIR}/yatex\\"\\n\ \\t) load-path))\\n .if defined(MULE) -EMACSDIR= ${PREFIX}/lib/mule +EMACSDIR= ${PREFIX}/share/mule +SITESTARTDIR= ${EMACSDIR}/19.34/site-lisp .endif .if defined(XEMACS-MULE) EMACS= xemacs @@ -44,6 +45,7 @@ # INFODIR= ${EMACSDIR}/info ADDSITESTART= +SITESTARTDIR= .endif .if defined(MULE) || defined(XEMACS-MULE) NEW= yatex.new @@ -95,6 +97,7 @@ -e 's,%INFONODES%,${INFONODES},g' \ -e 's,%INFONODEEXPS%,${INFONODEEXPS},g' \ -e 's,%DIRSECTION%,${DIRSECTION},g' \ + -e 's,%SITESTARTDIR%,${SITESTARTDIR},g' \ -e 's,%ADDSITESTART%,${ADDSITESTART},g' \ < ${FILESDIR}/$${file}.tmpl > ${FILESDIR}/$${file}; \ done diff -aruN print/yatex.org/files/DEINSTALL.tmpl print/yatex/files/DEINSTALL.tmpl --- print/yatex.org/files/DEINSTALL.tmpl Fri Aug 14 09:16:07 1998 +++ print/yatex/files/DEINSTALL.tmpl Wed Oct 7 11:08:26 1998 @@ -10,6 +10,7 @@ infodir=${INFODIR:-%INFODIR%} infofiles=${INFOFILES:-%INFOFILES%} +sitestartdir=${SITESTARTDIR:-%SITESTARTDIR%} elispdir=${ELISPDIR:-%ELISPDIR%} OptionStart=";;; configuration options for ${pkgname}" @@ -20,12 +21,12 @@ for file in `echo ${infofiles} | ${SED} "s,:, ,g"`; do install-info --delete ${infodir}/${file} ${infodir}/dir done - if [ "`grep \"^${OptionStart}\" ${elispdir}/site-start.el`" ]; then - ${ECHO} "Deleting entry for \"${pkgname}\" from ${elispdir}/site-start.el" + if [ "`grep \"^${OptionStart}\" ${sitestartdir}/site-start.el`" ]; then + ${ECHO} "Deleting entry for \"${pkgname}\" from ${sitestartdir}/site-start.el" ${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \ - ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak - ${CP} ${elispdir}/site-start.el.bak ${elispdir}/site-start.el - ${RM} ${elispdir}/site-start.el.bak + ${sitestartdir}/site-start.el > ${sitestartdir}/site-start.el.bak + ${CP} ${sitestartdir}/site-start.el.bak ${sitestartdir}/site-start.el + ${RM} ${sitestartdir}/site-start.el.bak fi else exit 0 diff -aruN print/yatex.org/files/INSTALL.tmpl print/yatex/files/INSTALL.tmpl --- print/yatex.org/files/INSTALL.tmpl Fri Aug 14 09:16:07 1998 +++ print/yatex/files/INSTALL.tmpl Wed Oct 7 11:08:16 1998 @@ -15,14 +15,15 @@ infonodes=${INFONODES:-%INFONODES%} infonodeexps=${INFONODEEXPS:-%INFONODEEXPS%} elispdir=${ELISPDIR:-%ELISPDIR%} +sitestartdir=${SITESTARTDIR:-%SITESTARTDIR%} dirsection=${DIRSECTION:-%DIRSECTION%} OptionStart=";;; configuration options for ${pkgname}" OptionEnd=";;; End of configuration options for ${pkgname}" if [ "X$2" = X"POST-INSTALL" ]; then - if [ ! -f ${elispdir}/site-start.el ]; then - ${TOUCH} ${elispdir}/site-start.el + if [ ! -f ${sitestartdir}/site-start.el ]; then + ${TOUCH} ${sitestartdir}/site-start.el fi count=1 # For example, the result of `cut ttt -d : -f 2` is ttt. Why? @@ -49,16 +50,16 @@ install-info ${infodir}/${file} ${infodir}/dir done if [ X'%ADDSITESTART%' != X ]; then - if [ "`${GREP} \"^${OptionStart}\" ${elispdir}/site-start.el`" ]; then + if [ "`${GREP} \"^${OptionStart}\" ${sitestartdir}/site-start.el`" ]; then ${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \ - ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak - ${CP} ${elispdir}/site-start.el.bak ${elispdir}/site-start.el + ${sitestartdir}/site-start.el > ${sitestartdir}/site-start.el.bak + ${CP} ${sitestartdir}/site-start.el.bak ${sitestartdir}/site-start.el fi - ${ECHO} "Adding entry for \"${pkgname}\" to ${elispdir}/site-start.el" - ${ECHO} "${OptionStart}" >> ${elispdir}/site-start.el + ${ECHO} "Adding entry for \"${pkgname}\" to ${sitestartdir}/site-start.el" + ${ECHO} "${OptionStart}" >> ${sitestartdir}/site-start.el /usr/bin/printf "%ADDSITESTART%" | \ - ${SED} "s/^ //" >> ${elispdir}/site-start.el - ${ECHO} "${OptionEnd}" >> ${elispdir}/site-start.el + ${SED} "s/^ //" >> ${sitestartdir}/site-start.el + ${ECHO} "${OptionEnd}" >> ${sitestartdir}/site-start.el fi exit 0 else >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message