From 201a00eed6ad9bf892554466b6e983cfa651c031 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 22 Nov 2000 12:03:43 +0000 Subject: [PATCH] - Add MAINTAINER - Update to version 1.1b6 --- misc/impress/Makefile | 20 ++++---- misc/impress/files/md5 | 6 +-- misc/impress/patches/patch-aa | 12 +++-- misc/impress/patches/patch-ab | 43 +++++++++++++++++ misc/impress/patches/patch-ac | 89 +++++++++++++++++++++++++++++++++++ misc/impress/pkg/DESCR | 2 +- misc/impress/pkg/PLIST | 29 +++++++++++- 7 files changed, 180 insertions(+), 21 deletions(-) create mode 100644 misc/impress/patches/patch-ab create mode 100644 misc/impress/patches/patch-ac diff --git a/misc/impress/Makefile b/misc/impress/Makefile index e93e5cec7fc..c336fd13838 100644 --- a/misc/impress/Makefile +++ b/misc/impress/Makefile @@ -1,11 +1,14 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2000/07/23 14:45:03 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2000/11/22 12:03:43 kevlo Exp $ -DISTNAME= imp1.1b -PKGNAME= impress-1.1b +DISTNAME= imp1.1b6 +PKGNAME= impress-1.1b6 CATEGORIES= misc -NEED_VERSION= 1.319 +NEED_VERSION= 1.338 +MASTER_SITES= ${HOMEPAGE} -MASTER_SITES= http://www.ntlug.org/~ccox/impress/ +HOMEPAGE= http://www.ntlug.org/~ccox/impress/ + +MAINTAINER= Kevin Lo PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -14,11 +17,6 @@ PERMIT_DISTFILES_FTP= Yes RUN_DEPENDS= wish8.3::x11/tk/8.3 -WRKDIST= ${WRKDIR}/impress-1.1-beta - -NO_BUILD= Yes - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/impress.tcl ${PREFIX}/bin/impress +WRKDIST= ${WRKDIR}/impress-1.1-b6 .include diff --git a/misc/impress/files/md5 b/misc/impress/files/md5 index 1c6122e7a63..7bea69b6aa8 100644 --- a/misc/impress/files/md5 +++ b/misc/impress/files/md5 @@ -1,3 +1,3 @@ -MD5 (imp1.1b.tar.gz) = bf7e88abbe19ac3dafb21bd06b9b8b86 -RMD160 (imp1.1b.tar.gz) = 719ec8ce63a667b633677eba9b2e8c659b633bb3 -SHA1 (imp1.1b.tar.gz) = ae83704bd626a689f12dba913ed2cc38ffbf0fb1 +MD5 (imp1.1b6.tar.gz) = 3b54b28a4dd7f24ef9b9a292449be2a2 +RMD160 (imp1.1b6.tar.gz) = 2deeac83178ded2f02b0e4e8bd2c5e19a8497e5d +SHA1 (imp1.1b6.tar.gz) = fbdbfdd05f5fa4e50f67ec3f7862257546e31978 diff --git a/misc/impress/patches/patch-aa b/misc/impress/patches/patch-aa index 91cf200fb49..6b66c4dace9 100644 --- a/misc/impress/patches/patch-aa +++ b/misc/impress/patches/patch-aa @@ -1,11 +1,13 @@ ---- impress.tcl.orig Thu Jul 20 21:23:05 2000 -+++ impress.tcl Thu Jul 20 21:23:19 2000 -@@ -4,7 +4,7 @@ +--- src/impress.tcl.orig Wed Nov 22 19:45:32 2000 ++++ src/impress.tcl Wed Nov 22 19:45:54 2000 +@@ -2,9 +2,8 @@ # - # $Header: /home/cvs/ports/misc/impress/patches/Attic/patch-aa,v 1.1.1.1 2000/07/23 14:45:03 kevlo Exp $ + # Copyright © 1996,1997,1998,1999,2000 Christopher Jay Cox, All rights reserved. + # +-# $Header: /home/cvs/ports/misc/impress/patches/Attic/patch-aa,v 1.2 2000/11/22 12:03:50 kevlo Exp $ # restart trick \ -exec wish "$0" "$@" +exec wish8.3 "$0" "$@" + option add *Radiobutton*borderWidth 1 option add *Button*borderWidth 1 - diff --git a/misc/impress/patches/patch-ab b/misc/impress/patches/patch-ab new file mode 100644 index 00000000000..c4c2f5efac9 --- /dev/null +++ b/misc/impress/patches/patch-ab @@ -0,0 +1,43 @@ +--- Makefile.orig Wed Nov 22 19:47:28 2000 ++++ Makefile Wed Nov 22 19:49:14 2000 +@@ -1,33 +1,11 @@ +-cmp=/usr/bin/cmp +-cp=/bin/cp +-mv=/bin/mv +-strip=/usr/bin/strip +-ln=/bin/ln +-PREFIX=/usr ++PREFIX?=/usr/local + +-all: make_impress make_font3d make_pstoedit ++all: make_impress + +-make_font3d: +- (cd font3d;make LDFLAGS=-static) +- @-${strip} font3d/font3d +- @-${cmp} font3d/font3d bin/font3d 2>/dev/null || \ +- ${cp} font3d/font3d bin/font3d +- +-make_pstoedit: +- (cd pstoedit/config;./configure) +- (cd pstoedit/src;make LINK="c++ -static") +- @-${strip} pstoedit/src/pstoedit +- @-${cmp} pstoedit/src/pstoedit bin/pstoedit 2>/dev/null || \ +- ${cp} pstoedit/src/pstoedit bin/pstoedit +- + make_impress: +- (cd src;make all install) +- +-$(PREFIX)/bin/pstoedit.orig: +- @-mv $(PREFIX)/bin/pstoedit $(PREFIX)/bin/pstoedit.orig ++ (cd src;make all) + +-install: $(PREFIX)/bin/pstoedit.orig +- install -c bin/impress $(PREFIX)/bin && rm -f $(PREFIX)/bin/impress.tcl && ${ln} -s $(PREFIX)/bin/impress $(PREFIX)/bin/impress.tcl +- install -c bin/transeps $(PREFIX)/bin +- install -c bin/font3d $(PREFIX)/bin +- install -c bin/pstoedit $(PREFIX)/bin ++install: ++ install -c -m 755 src/impress $(PREFIX)/bin ++ @mkdir $(PREFIX)/share/doc/impress ++ @cp src/doc/* $(PREFIX)/share/doc/impress diff --git a/misc/impress/patches/patch-ac b/misc/impress/patches/patch-ac new file mode 100644 index 00000000000..a5610820c55 --- /dev/null +++ b/misc/impress/patches/patch-ac @@ -0,0 +1,89 @@ +--- src/Makefile.orig Wed Nov 22 19:46:45 2000 ++++ src/Makefile Wed Nov 22 19:50:27 2000 +@@ -1,85 +1,8 @@ +-cmp=/usr/bin/cmp +-cp=/bin/cp +-mv=/bin/mv +-ln=/bin/ln +- +-all: impress transeps ++all: impress + + impress: impress.tcl + cat impress.tcl >impress + chmod a+x impress +- +-../pstoedit/src/drvtk.cpp.orig: +- @-${mv} ../pstoedit/src/drvtk.cpp ../pstoedit/src/drvtk.cpp.orig +- +-../pstoedit/src/drvtk.h.orig: +- @-${mv} ../pstoedit/src/drvtk.h ../pstoedit/src/drvtk.h.orig +- +-installdrvtk: ../pstoedit/src/drvtk.cpp.orig ../pstoedit/src/drvtk.h.orig +- @-${cmp} drvtk.cpp ../pstoedit/src/drvtk.cpp 2>/dev/null || \ +- echo "Updating drvtk.cpp" >&2 && ${cp} drvtk.cpp ../pstoedit/src +- @-${cmp} drvtk.h ../pstoedit/src/drvtk.h 2>/dev/null || \ +- echo "Updating drvtk.h" >&2 && ${cp} drvtk.h ../pstoedit/src +- +-install: impress impress.tcl transeps COPYING CHANGES README installdrvtk +- @-mkdir ../bin +- @-${cmp} impress ../bin/impress 2>/dev/null || \ +- echo "Updating impress" >&2 && ${cp} impress ../bin +- @-${cmp} transeps ../bin/transeps 2>/dev/null || \ +- echo "Updating transeps" >&2 && ${cp} transeps ../bin +- @-${cmp} COPYING ../COPYING 2>/dev/null || \ +- echo "Updating COPYING" >&2 && ${cp} COPYING .. +- @-${cmp} README ../README 2>/dev/null || \ +- echo "Updating README" >&2 && ${cp} README .. +- @-${cmp} CHANGES ../CHANGES 2>/dev/null || \ +- echo "Updating CHANGES" >&2 && ${cp} CHANGES .. +- @-mkdir ../doc +- @-${cmp} doc/arrows.gif ../doc/arrows.gif 2>/dev/null || \ +- echo "Updating arrows.gif" >&2 && ${cp} doc/arrows.gif ../doc +- @-${cmp} doc/custcolor.gif ../doc/custcolor.gif 2>/dev/null || \ +- echo "Updating custcolor.gif" >&2 && ${cp} doc/custcolor.gif ../doc +- @-${cmp} doc/file.gif ../doc/file.gif 2>/dev/null || \ +- echo "Updating file.gif" >&2 && ${cp} doc/file.gif ../doc +- @-${cmp} doc/fonts.gif ../doc/fonts.gif 2>/dev/null || \ +- echo "Updating fonts.gif" >&2 && ${cp} doc/fonts.gif ../doc +- @-${cmp} doc/grid.gif ../doc/grid.gif 2>/dev/null || \ +- echo "Updating grid.gif" >&2 && ${cp} doc/grid.gif ../doc +- @-${cmp} doc/impdoc.html ../doc/impdoc.html 2>/dev/null || \ +- echo "Updating impdoc.html" >&2 && ${cp} doc/impdoc.html ../doc +- @-${cmp} doc/implogo.gif ../doc/implogo.gif 2>/dev/null || \ +- echo "Updating implogo.gif" >&2 && ${cp} doc/implogo.gif ../doc +- @-${cmp} doc/impressbuttons.gif ../doc/impressbuttons.gif 2>/dev/null || \ +- echo "Updating impressbuttons.gif" >&2 && ${cp} doc/impressbuttons.gif ../doc +- @-${cmp} doc/impressmain2.gif ../doc/impressmain2.gif 2>/dev/null || \ +- echo "Updating impressmain2.gif" >&2 && ${cp} doc/impressmain2.gif ../doc +- @-${cmp} doc/lgtoolbar.gif ../doc/lgtoolbar.gif 2>/dev/null || \ +- echo "Updating lgtoolbar.gif" >&2 && ${cp} doc/lgtoolbar.gif ../doc +- @-${cmp} doc/openurldialog.gif ../doc/openurldialog.gif 2>/dev/null || \ +- echo "Updating openurldialog.gif" >&2 && ${cp} doc/openurldialog.gif ../doc +- @-${cmp} doc/page.gif ../doc/page.gif 2>/dev/null || \ +- echo "Updating page.gif" >&2 && ${cp} doc/page.gif ../doc +- @-${cmp} doc/palette.gif ../doc/palette.gif 2>/dev/null || \ +- echo "Updating palette.gif" >&2 && ${cp} doc/palette.gif ../doc +- @-${cmp} doc/paper.gif ../doc/paper.gif 2>/dev/null || \ +- echo "Updating paper.gif" >&2 && ${cp} doc/paper.gif ../doc +- @-${cmp} doc/print.gif ../doc/print.gif 2>/dev/null || \ +- echo "Updating print.gif" >&2 && ${cp} doc/print.gif ../doc +- @-${cmp} doc/props.gif ../doc/props.gif 2>/dev/null || \ +- echo "Updating props.gif" >&2 && ${cp} doc/props.gif ../doc +- @-${cmp} doc/pstoedit.gif ../doc/pstoedit.gif 2>/dev/null || \ +- echo "Updating pstoedit.gif" >&2 && ${cp} doc/pstoedit.gif ../doc +- @-${cmp} doc/selection.gif ../doc/selection.gif 2>/dev/null || \ +- echo "Updating selection.gif" >&2 && ${cp} doc/selection.gif ../doc +- @-${cmp} doc/slide.gif ../doc/slide.gif 2>/dev/null || \ +- echo "Updating slide.gif" >&2 && ${cp} doc/slide.gif ../doc +- @-${cmp} doc/tclet.gif ../doc/tclet.gif 2>/dev/null || \ +- echo "Updating tclet.gif" >&2 && ${cp} doc/tclet.gif ../doc +- @-${cmp} doc/toolbarpref.gif ../doc/toolbarpref.gif 2>/dev/null || \ +- echo "Updating toolbarpref.gif" >&2 && ${cp} doc/toolbarpref.gif ../doc +- @-${cmp} doc/urldialog.gif ../doc/urldialog.gif 2>/dev/null || \ +- echo "Updating urldialog.gif" >&2 && ${cp} doc/urldialog.gif ../doc +- @-${cmp} doc/miniview.gif ../doc/miniview.gif 2>/dev/null || \ +- echo "Updating miniview.gif" >&2 && ${cp} doc/miniview.gif ../doc + + clean: + rm -f impress transeps diff --git a/misc/impress/pkg/DESCR b/misc/impress/pkg/DESCR index e1d87e989f6..203f78e8b00 100644 --- a/misc/impress/pkg/DESCR +++ b/misc/impress/pkg/DESCR @@ -8,4 +8,4 @@ ImPress can be significantly enhanced through use of several modified utilities: o Font3D - Translates TrueType font strings to vectorized Tk. o Type1inst - Aids in maintaining Ghostscript Fontmaps and X11 fonts.dir files. -WWW: http://www.ntlug.org/~ccox/impress +WWW: ${HOMEPAGE} diff --git a/misc/impress/pkg/PLIST b/misc/impress/pkg/PLIST index f9877b9e488..7b6ffb55e9d 100644 --- a/misc/impress/pkg/PLIST +++ b/misc/impress/pkg/PLIST @@ -1,2 +1,29 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2000/07/23 14:45:03 kevlo Exp $ +@comment $OpenBSD: PLIST,v 1.2 2000/11/22 12:03:54 kevlo Exp $ bin/impress +share/doc/impress/add.txt +share/doc/impress/arrows.gif +share/doc/impress/custcolor.gif +share/doc/impress/file.gif +share/doc/impress/fonts.gif +share/doc/impress/grid.gif +share/doc/impress/impdoc.html +share/doc/impress/impdoc2.html +share/doc/impress/implogo.gif +share/doc/impress/impressbuttons.gif +share/doc/impress/impressmain2.gif +share/doc/impress/keys.gif +share/doc/impress/lgtoolbar.gif +share/doc/impress/miniview.gif +share/doc/impress/openurldialog.gif +share/doc/impress/page.gif +share/doc/impress/palette.gif +share/doc/impress/paper.gif +share/doc/impress/print.gif +share/doc/impress/props.gif +share/doc/impress/pstoedit.gif +share/doc/impress/selection.gif +share/doc/impress/slide.gif +share/doc/impress/tclet.gif +share/doc/impress/toolbarpref.gif +share/doc/impress/urldialog.gif +@dirrm share/doc/impress