Date: Tue, 20 May 1997 00:51:56 +0900 (JST) From: Kazuhiko Kiriyama(System administrator) <kiri@kiri.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/3631: Update port(jp-man-1.1):japanese/man. Message-ID: <199705191551.AAA01326@kiri.toba-cmt.ac.jp> Resent-Message-ID: <199705191550.IAA28632@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 3631
>Category: ports
>Synopsis: Update port(jp-man-1.1):japanese/man.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Class: support
>Submitter-Id: current-users
>Arrival-Date: Mon May 19 08:50:01 PDT 1997
>Last-Modified:
>Originator: Kazuhiko Kiriyama
>Organization:
Toba National College of Maritime Technology.
Department of Electronic Mechanical Engineering
>Release: FreeBSD 2.2.2-RELEASE i386
>Environment:
>Description:
I've updated the port(jp-man-1.1):japanese/man.
Current modifications is
(1) Change Makefile.
(2) Change pkg/INSTALL according to change jp-groff-0.99.
I put the diff from ports-current(japanese/man) in "Fix:".
>How-To-Repeat:
>Fix:
diff -aurN ../../current/ports/japanese/man/Makefile ./Makefile
--- ../../current/ports/japanese/man/Makefile Mon Mar 31 17:52:54 1997
+++ ./Makefile Mon May 5 10:36:15 1997
@@ -34,44 +34,32 @@
# See a make rule of target pre-patch for details.
#
XPG4LIBPATH?= /usr/lib
-XPG4PATCHFILEORG= patch-xpg4_org
-NOXPG4PATCHFILEORG= patch-noxpg4_org
-XPG4PATCHFILE= patch-xpg4
-XPG4PATCHSUFX= xpg4
pre-patch:
@${MKDIR} ${PATCHDIR}
- @rm -f ${PATCHDIR}/patch-${XPG4PATCHSUFX}
+ @${RM} -f ${PATCHDIR}/patch-aa
.if !defined(NOUSE_XPG4LIB)
- @${SED} -e "s,%xpg4_lib_path%,${XPG4LIBPATH},g" < ${FILESDIR}/${XPG4PATCHFILEORG} > ${FILESDIR}/${XPG4PATCHFILE}
-.if defined(PATCH_DEBUG)
+ @${SED} -e "s,%XPG4LIBPATH%,${XPG4LIBPATH},g" \
+ < ${FILESDIR}/patch-xpg4.tmpl > ${FILESDIR}/patch-xpg4
@(for libfile in ${XPG4LIBPATH}/libxpg4*; do \
if [ ! "$$libfile" = "" ]; then \
- ${ECHO_MSG} "===> Finding the xpg4 library in /usr/lib"; \
- ln -sf ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}; \
- ${ECHO_MSG} "===> Adding on a patch for to use the xpg4 libray when linking"; \
+ ln -sf ${FILESDIR}/patch-xpg4 \
+ ${PATCHDIR}/patch-aa; \
break 1; \
fi; \
done)
.else
- @(for libfile in ${XPG4LIBPATH}/libxpg4*; do \
- if [ ! "$$libfile" = "" ]; then \
- ln -sf ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}; \
- break 1; \
- fi; \
- done)
-.endif
-.else
- @${CP} ${FILESDIR}/${NOXPG4PATCHFILEORG} ${FILESDIR}/${XPG4PATCHFILE}
- @ln -sf ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}
+ @ln -sf ${FILESDIR}/patch-noxpg4 ${PATCHDIR}/patch-aa
.endif
post-install:
@${MKDIR} ${JMANELDIR}
@${INSTALL_DATA} ${FILESDIR}/jman.el ${JMANELDIR}
- @${SETENV} CP=${CP} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+ @${SETENV} CP=${CP} PKG_PREFIX=${PREFIX} \
+ /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
pre-clean:
- @rm -f ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}
+ @${RM} -f ${PATCHDIR}/patch-aa ${FILESDIR}/patch-xpg4
.include <bsd.port.mk>
+
diff -aurN ../../current/ports/japanese/man/files/patch-noxpg4 ./files/patch-noxpg4
--- ../../current/ports/japanese/man/files/patch-noxpg4 Thu Jan 1 09:00:00 1970
+++ ./files/patch-noxpg4 Mon Apr 7 15:51:14 1997
@@ -0,0 +1,10 @@
+--- man/Makefile Wed Dec 11 13:34:35 1996
++++ man/Makefile Fri Jan 10 00:25:15 1997
+@@ -9,7 +9,6 @@
+ .else
+ LDADD= -L${.CURDIR}/../lib/ -lman
+ .endif
+-LDADD+= -lxpg4
+
+ .if exists(${.CURDIR}/obj)
+ MAN1= ${.CURDIR}/obj/jman.1
diff -aurN ../../current/ports/japanese/man/files/patch-noxpg4_org ./files/patch-noxpg4_org
--- ../../current/ports/japanese/man/files/patch-noxpg4_org Fri Feb 14 14:20:18 1997
+++ ./files/patch-noxpg4_org Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- man/Makefile Wed Dec 11 13:34:35 1996
-+++ man/Makefile Fri Jan 10 00:25:15 1997
-@@ -9,7 +9,6 @@
- .else
- LDADD= -L${.CURDIR}/../lib/ -lman
- .endif
--LDADD+= -lxpg4
-
- .if exists(${.CURDIR}/obj)
- MAN1= ${.CURDIR}/obj/jman.1
diff -aurN ../../current/ports/japanese/man/files/patch-xpg4.tmpl ./files/patch-xpg4.tmpl
--- ../../current/ports/japanese/man/files/patch-xpg4.tmpl Thu Jan 1 09:00:00 1970
+++ ./files/patch-xpg4.tmpl Sat May 3 14:08:42 1997
@@ -0,0 +1,11 @@
+--- man/Makefile.org Sat Jan 11 09:07:27 1997
++++ man/Makefile Sat Jan 11 09:04:32 1997
+@@ -9,7 +9,7 @@
+ .else
+ LDADD= -L${.CURDIR}/../lib/ -lman
+ .endif
+-LDADD+= -lxpg4
++LDADD+= -L%XPG4LIBPATH% -lxpg4
+
+ .if exists(${.CURDIR}/obj)
+ MAN1= ${.CURDIR}/obj/jman.1
diff -aurN ../../current/ports/japanese/man/files/patch-xpg4_org ./files/patch-xpg4_org
--- ../../current/ports/japanese/man/files/patch-xpg4_org Fri Feb 14 14:20:18 1997
+++ ./files/patch-xpg4_org Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- man/Makefile.org Sat Jan 11 09:07:27 1997
-+++ man/Makefile Sat Jan 11 09:04:32 1997
-@@ -9,7 +9,7 @@
- .else
- LDADD= -L${.CURDIR}/../lib/ -lman
- .endif
--LDADD+= -lxpg4
-+LDADD+= -L%xpg4_lib_path% -lxpg4
-
- .if exists(${.CURDIR}/obj)
- MAN1= ${.CURDIR}/obj/jman.1
diff -aurN ../../current/ports/japanese/man/pkg/DEINSTALL ./pkg/DEINSTALL
--- ../../current/ports/japanese/man/pkg/DEINSTALL Sun Mar 30 11:57:19 1997
+++ ./pkg/DEINSTALL Mon May 5 10:39:34 1997
@@ -9,7 +9,7 @@
if [ "`grep \"^${OptionStart}\" ${elispdir}/site-start.el`" ]; then
echo "Deleting \"Jman\" entry from ${elispdir}/site-start.el"
sed -e "/^${OptionStart}/,/^${OptionEnd}/d" \
- ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
+ ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
mv ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
fi
fi
diff -aurN ../../current/ports/japanese/man/pkg/INSTALL ./pkg/INSTALL
--- ../../current/ports/japanese/man/pkg/INSTALL Mon Mar 31 17:52:57 1997
+++ ./pkg/INSTALL Mon May 5 10:38:12 1997
@@ -1,20 +1,19 @@
#!/bin/sh
-CP=${CP:-/bin/cp}
+TOUCH=${TOUCH:-/usr/bin/touch}
-usr_tmac=/usr/share/tmac
-local_tmac=${PKG_PREFIX}/share/groff/tmac
elispdir=${PKG_PREFIX}/lib/mule/site-lisp
OptionStart=";;; Jman configuration options"
OptionEnd=";;; End of Jman configuration options"
if [ "X$2" = X"POST-INSTALL" ]; then
- ${CP} -p ${usr_tmac}/tmac.an ${local_tmac}
- ${CP} -p ${usr_tmac}/tmac.groff_an ${local_tmac}
+ if [ ! -f ${elispdir}/site-start.el ]; then
+ ${TOUCH} ${elispdir}/site-start.el
+ fi
if [ "`grep \"^${OptionStart}\" ${elispdir}/site-start.el`" ]; then
sed -e "/^${OptionStart}/,/^${OptionEnd}/d" \
- ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
+ ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
mv ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
fi
echo "Adding \"Jman\" entry to ${elispdir}/site-start.el"
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199705191551.AAA01326>