Date: Thu, 20 Aug 1998 14:17:50 +0900 (JST) From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/7690: Update ports: gp-2.5p2(print/gp) Message-ID: <199808200517.OAA18040@pis.toba-cmt.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 7690
>Category: ports
>Synopsis: Update ports: gp-2.5p2(print/gp)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 19 22:20:01 PDT 1998
>Last-Modified:
>Originator: Kazuhiko Kiriyama
>Organization:
Toba National College of Maritime Technology.
Department of Electronic Mechanical Engineering
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
>Description:
I've updated the port gp-2.5p2(print/gp).
Current modifications are :
(1) Update according to original distfile's version up.
(2) Make completely co-existence with ja-gp-2.5p2
Update files are respecively :
[Add] :
(NONE)
[Delete] :
(NONE)
[Update] :
-rw-r--r-- 1 kiri staff 1967 Aug 20 14:10 print/gp/Makefile
-rw-r--r-- 1 kiri staff 1422 Aug 20 14:10 print/gp/scripts/post-build
-rw-r--r-- 1 kiri staff 1542 Aug 20 14:10 print/gp/patches/patch-aa
-rw-r--r-- 1 kiri staff 1128 Aug 20 14:10 print/gp/pkg/PLIST
-rw-r--r-- 1 kiri staff 57 Aug 20 14:10 print/gp/files/md5
I put the diff from ports-current in "Fix:".
>How-To-Repeat:
>Fix:
diff -u -r -x CVS -N /usr/ports/current/print/gp/Makefile ./Makefile
--- /usr/ports/current/print/gp/Makefile Sun Aug 9 02:37:09 1998
+++ ./Makefile Thu Aug 20 14:10:47 1998
@@ -1,68 +1,67 @@
# New ports collection makefile for: GP
-# Version required: 2.5
+# Version required: 2.5p1
# Date created: 15 April 1997
# Whom: Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
#
# $Id: Makefile,v 1.7 1998/08/07 23:56:46 asami Exp $
#
-DISTNAME= GP-2.5
-PKGNAME?= gp-2.5
-CATEGORIES+= print tk42
+DISTNAME= GP-2.5p2
+PKGNAME?= gp-2.5p2
+CATEGORIES= print tk42
MASTER_SITES= http://www.kamome.or.jp/hueda/GP/ \
ftp://www.neosoft.com/pub/tcl/sorted/print/GP-2.5/
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
-LIB_DEPENDS= ${WITH_LIB}
-RUN_DEPENDS= ${PREFIX}/bin/psbook:${PORTSDIR}/print/psutils \
- ${X11BASE}/bin/gv:${PORTSDIR}/print/gv \
- ${PREFIX}/bin/convert:${PORTSDIR}/graphics/ImageMagick \
- ${WITH_RUN}
-
PATCHDIR= ${.CURDIR}/../../print/gp/patches
FILESDIR= ${.CURDIR}/../../print/gp/files
SCRIPTDIR= ${.CURDIR}/../../print/gp/scripts
+RUN_DEPENDS= ${PREFIX}/bin/psbook:${PORTSDIR}/print/psutils \
+ ${X11BASE}/bin/gv:${PORTSDIR}/print/gv \
+ ${PREFIX}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+
LANGUAGE?= English
-.if (${LANGUAGE} == "Japanese")
-ALL_TARGET= ja filters
-.else
+.if (${LANGUAGE} == "English")
ALL_TARGET= filters
-.endif
-MAKE_ENV= LANGUAGE=${LANGUAGE}
-SCRIPTS_ENV= MV=${MV} RM=${RM} SED=${SED} LANGUAGE=${LANGUAGE}
-
-PORTDOCDIR= ${PREFIX}/share/doc/GP
-.if (${LANGUAGE} == "Japanese")
+LIB_DEPENDS= tcl76\\.1\\.:${PORTSDIR}/lang/tcl76
+RUN_DEPENDS+= ${PREFIX}/bin/wish4.2:${PORTSDIR}/x11-toolkits/tk42
+LANGEXT= en
+DOCDIRNAME= Doc
+DOCEXT=
+.elif (${LANGUAGE} == "Japanese")
+ALL_TARGET= ja filters
+LIB_DEPENDS= tcl76jp\\.1\\.:${PORTSDIR}/japanese/tcl76
+RUN_DEPENDS+= ${PREFIX}/bin/wish4.2jp:${PORTSDIR}/japanese/tk42
+LANGEXT= ja
DOCDIRNAME= Doc.ja
DOCEXT= .euc
-WITH_LIB= tcl76jp\\.1\\.:${PORTSDIR}/japanese/tcl76
-WITH_RUN= ${PREFIX}/bin/wish4.2jp:${PORTSDIR}/japanese/tk42 \
- ${PREFIX}/bin/a2ps-j:${PORTSDIR}/japanese/a2ps \
- ${X11BASE}/bin/xdvi:${PORTSDIR}/japanese/vfxdvi \
- ${PREFIX}/bin/dvi2ps:${PORTSDIR}/japanese/dvi2ps
+.endif
+MAKE_ENV= LANGUAGE=${LANGUAGE} LANGEXT=${LANGEXT}
+SCRIPTS_ENV= MV=${MV} RM=${RM} SED=${SED} LANGUAGE=${LANGUAGE} LANGEXT=${LANGEXT}
+
+.if (${LANGEXT} == "en")
+PORTDOCDIR= ${PREFIX}/share/doc/GP/
.else
-DOCDIRNAME= Doc
-DOCEXT=
-WITH_LIB= tcl76\\.1\\.:${PORTSDIR}/lang/tcl76
-WITH_RUN= ${PREFIX}/bin/wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
- ${PREFIX}/bin/a2ps:${PORTSDIR}/print/a2ps \
- ${X11BASE}/bin/xdvi:${PORTSDIR}/print/xdvi \
- ${PREFIX}/bin/dvips:${PORTSDIR}/print/dvips
+PORTDOCDIR= ${PREFIX}/share/doc/GP/${LANGEXT}/
.endif
post-install:
+ if [ -h ${PREFIX}/bin/GP ]; then \
+ mv ${PREFIX}/bin/GP ${PREFIX}/bin/GP.previous; \
+ fi
+ ${LN} -sf GP${LANGEXT} ${PREFIX}/bin/GP
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PORTDOCDIR}/Manual/${LANGUAGE}/image
+ @${MKDIR} ${PORTDOCDIR}Manual/image
@(cd ${WRKSRC}; \
${INSTALL_DATA} ${DOCDIRNAME}/*${DOCEXT} ${PORTDOCDIR}; \
)
@(cd ${WRKSRC}/Manual; \
- ${INSTALL_DATA} GP.gif README${DOCEXT} index.html ${PORTDOCDIR}/Manual; \
- ${INSTALL_DATA} ${LANGUAGE}/*.html ${PORTDOCDIR}/Manual/${LANGUAGE}; \
- ${INSTALL_DATA} ${LANGUAGE}/image/*.gif ${PORTDOCDIR}/Manual/${LANGUAGE}/image; \
+ ${INSTALL_DATA} GP.gif README${DOCEXT} index.html ${PORTDOCDIR}Manual; \
+ ${INSTALL_DATA} ${LANGUAGE}/*.html ${PORTDOCDIR}Manual; \
+ ${INSTALL_DATA} ${LANGUAGE}/image/*.gif ${PORTDOCDIR}Manual/image; \
)
.endif
diff -u -r -x CVS -N /usr/ports/current/print/gp/files/md5 ./files/md5
--- /usr/ports/current/print/gp/files/md5 Sun May 31 21:42:46 1998
+++ ./files/md5 Thu Aug 20 14:03:04 1998
@@ -1 +1 @@
-MD5 (GP-2.5.tar.gz) = 8dad10aed6e8b6c7ea0563dbaeeb42c9
+MD5 (GP-2.5p2.tar.gz) = 81804422fd678fb01e18e4586ca901a2
diff -u -r -x CVS -N /usr/ports/current/print/gp/patches/patch-aa ./patches/patch-aa
--- /usr/ports/current/print/gp/patches/patch-aa Sun May 31 21:42:47 1998
+++ ./patches/patch-aa Thu Aug 20 14:03:05 1998
@@ -1,26 +1,57 @@
-*** Makefile.orig Sun Feb 1 20:48:49 1998
---- Makefile Sun Feb 22 21:27:43 1998
-***************
-*** 13,20 ****
- BINDIR = $(PREFIX)/bin
- LIBDIR = $(PREFIX)/lib/GP
-
-! FILTERS = `ls filters`
-! FILTERS.SAMPLE = `ls filters.sample`
-
- ICONS = printer.xbm exit.xbm
-
---- 13,25 ----
- BINDIR = $(PREFIX)/bin
- LIBDIR = $(PREFIX)/lib/GP
-
-! .if (${LANGUAGE} == "Japanese")
-! FILTERS =a2ps-j dvi2ps-j ImageMagick
-! .else
-! FILTERS =a2ps dvips ImageMagick
-! .endif
-!
-! FILTERS.SAMPLE!= ls filters.sample
-
- ICONS = printer.xbm exit.xbm
-
+--- Makefile.orig Tue May 5 11:57:38 1998
++++ Makefile Wed Aug 19 22:59:49 1998
+@@ -8,12 +8,18 @@
+ MKDIR = /bin/mkdir
+
+
+-PREFIX = /usr/local/
++#PREFIX = /usr/local/
+ BINDIR = $(PREFIX)/bin
+-LIBDIR = $(PREFIX)/lib/GP
++LIBDIR = $(PREFIX)/lib/GP/${LANGEXT}/
+
+-FILTERS = `ls filters`
+-FILTERS.SAMPLE = `ls filters.sample`
++.if (${LANGUAGE} == "English")
++LIBDIR = $(PREFIX)/lib/GP/
++FILTERS= a2ps dvips ImageMagick
++.elif (${LANGUAGE} == "Japanese")
++FILTERS= a2ps-j dvi2ps-j ImageMagick
++.endif
++
++FILTERS.SAMPLE!= ls filters.sample
+
+ ICONS = printer.xbm exit.xbm
+
+@@ -45,25 +51,25 @@
+
+ install.bin:
+ @$(MKDIR) -p $(BINDIR)
+- @$(INSTALL) -m 755 GP $(BINDIR)/GP
++ @$(INSTALL) -m 755 GP $(BINDIR)/GP${LANGEXT}
+ @echo Installing GP in $(BINDIR)
+
+ install.lib:
+- @$(MKDIR) -p $(LIBDIR)/filters
+- @$(MKDIR) -p $(LIBDIR)/icons
++ @$(MKDIR) -p $(LIBDIR)filters
++ @$(MKDIR) -p $(LIBDIR)icons
+ @$(INSTALL) -m 644 lib/filetype $(LIBDIR)
+ @$(INSTALL) -m 644 lib/printer $(LIBDIR)
+ @for i in $(ICONS); do \
+- $(INSTALL) -m 644 icons/$$i $(LIBDIR)/icons; \
++ $(INSTALL) -m 644 icons/$$i $(LIBDIR)icons; \
+ done
+ @echo Installing GP Configuration files in $(LIBDIR)
+
+ install.filters:
+ @echo
+- @echo Filter Configuration files are now installing in $(LIBDIR)/filters...
++ @echo Filter Configuration files are now installing in $(LIBDIR)filters...
+ @for i in $(FILTERS); do \
+ echo Installing $$i; \
+- $(INSTALL) -m 644 filters/$$i $(LIBDIR)/filters; \
++ $(INSTALL) -m 644 filters/$$i $(LIBDIR)filters; \
+ done
+
+ ja:
diff -u -r -x CVS -N /usr/ports/current/print/gp/pkg/PLIST ./pkg/PLIST
--- /usr/ports/current/print/gp/pkg/PLIST Sun May 31 21:42:47 1998
+++ ./pkg/PLIST Thu Aug 20 14:03:05 1998
@@ -1,4 +1,6 @@
-bin/GP
+bin/GPen
+@exec cd %B;if [ -h GP ]; then mv GP GP.previous; fi;ln -sf %f GP
+@unexec cd %B;ls -l GP GP.previous 2>/dev/null|awk -v f=%f '$11==f{cmd="rm -f " $9; system(cmd)}';if [ -h GP.previous ]; then mv GP.previous GP; fi
lib/GP/filters/ImageMagick
lib/GP/filters/a2ps
lib/GP/filters/dvips
@@ -15,23 +17,20 @@
share/doc/GP/Manual/GP.gif
share/doc/GP/Manual/index.html
share/doc/GP/Manual/README
-share/doc/GP/Manual/English/bug_info.html
-share/doc/GP/Manual/English/future.html
-share/doc/GP/Manual/English/intro.html
-share/doc/GP/Manual/English/option.html
-share/doc/GP/Manual/English/print.html
-share/doc/GP/Manual/English/queue.html
-share/doc/GP/Manual/English/queue_remove.html
-share/doc/GP/Manual/English/start.html
-share/doc/GP/Manual/English/image/Remove.gif
-share/doc/GP/Manual/English/image/Queue.gif
-share/doc/GP/Manual/English/image/Print.gif
-share/doc/GP/Manual/English/image/Option.gif
-share/doc/GP/Manual/English/image/GPicon.gif
+share/doc/GP/Manual/bug_info.html
+share/doc/GP/Manual/future.html
+share/doc/GP/Manual/intro.html
+share/doc/GP/Manual/option.html
+share/doc/GP/Manual/print.html
+share/doc/GP/Manual/queue.html
+share/doc/GP/Manual/queue_remove.html
+share/doc/GP/Manual/start.html
+share/doc/GP/Manual/image/Remove.gif
+share/doc/GP/Manual/image/Queue.gif
+share/doc/GP/Manual/image/Print.gif
+share/doc/GP/Manual/image/Option.gif
+share/doc/GP/Manual/image/GPicon.gif
@dirrm lib/GP/filters
@dirrm lib/GP/icons
-@dirrm lib/GP
-@dirrm share/doc/GP/Manual/English/image
-@dirrm share/doc/GP/Manual/English
+@dirrm share/doc/GP/Manual/image
@dirrm share/doc/GP/Manual
-@dirrm share/doc/GP
diff -u -r -x CVS -N /usr/ports/current/print/gp/scripts/post-build ./scripts/post-build
--- /usr/ports/current/print/gp/scripts/post-build Sun May 31 21:42:47 1998
+++ ./scripts/post-build Thu Aug 20 14:03:05 1998
@@ -3,28 +3,37 @@
cd ${WRKSRC}
${MV} GP GP.bak
+if [ X"${LANGUAGE}" = "XEnglish" ]; then
${SED} \
- -e '/^set[ ]*PRINTER_LIST[ ]/s@/usr/local@%%PREFIX%%@' \
- -e '/^set[ ]*FILETYPE_LIST[ ]/s@/usr/local@%%PREFIX%%@' \
- -e '/^set[ ]*FILTERS_DIR[ ]/s@/usr/local@%%PREFIX%%@' \
- -e '/^set[ ]*ICONS_PATH[ ]/s@/usr/local@%%PREFIX%%@' \
- -e '/^set[ ]*PS_PREVIEWER[ ]/s@ghostview@gv@' \
+-e 's@^\(set[ ]*PRINTER_LIST[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/printer"\2@' \
+-e 's@^\(set[ ]*FILETYPE_LIST[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/filetype"\2@' \
+-e 's@^\(set[ ]*FILTERS_DIR[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/filters"\2@' \
+-e 's@^\(set[ ]*ICONS_PATH[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/icons"\2@' \
< GP.bak > GP
+elif [ X"${LANGUAGE}" = "XJapanese" ]; then
+${SED} \
+-e 's@^\(set[ ]*PRINTER_LIST[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/printer"\2@' \
+-e 's@^\(set[ ]*FILETYPE_LIST[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/filetype"\2@' \
+-e 's@^\(set[ ]*FILTERS_DIR[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/filters"\2@' \
+-e 's@^\(set[ ]*ICONS_PATH[ ]*\)"[^"]*"\(.*\)$@\1"%%PREFIX%%/lib/GP/ja/icons"\2@' \
+ < GP.bak > GP
+fi
${MV} GP GP.bak
${SED} \
- -e "s@%%PREFIX%%@${PREFIX}@g" \
+ -e "s@%%PREFIX%%@${PREFIX}@g" \
+ -e 's@^\(set[ ]*PS_PREVIEWER[ ]*\)"[^"]*"\(.*\)$@\1"/usr/X11R6/bin/gv"\2@' \
< GP.bak > GP
cd ${WRKSRC}/filters
-if [ X"${LANGUAGE}" = "XJapanese" ]; then
- for f in a2ps-j dvi2ps-j; do
+if [ X"${LANGUAGE}" = "XEnglish" ]; then
+ for f in a2ps dvips; do
${MV} ${f} ${f}.bak
${SED} -e 's@^\(NUMBER[ ]*=\).*$@\1 1@' < ${f}.bak > ${f}
${RM} -f ${f}.bak
done
-else
- for f in a2ps dvips; do
+elif [ X"${LANGUAGE}" = "XJapanese" ]; then
+ for f in a2ps-j dvi2ps-j; do
${MV} ${f} ${f}.bak
${SED} -e 's@^\(NUMBER[ ]*=\).*$@\1 1@' < ${f}.bak > ${f}
${RM} -f ${f}.bak
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199808200517.OAA18040>