Attachment 8709 Details for Bug 18117 – file.diff

[patch] file.diff

file.diff (text/plain), 4.69 KB, created by root on 2000-04-20 17:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: root

Created: 2000-04-20 17:50:00 UTC

Size: 4.69 KB

patch

obsolete

>diff -N -P -U1 -r siag/Makefile siag/Makefile
>--- siag/Makefile	Fri Apr 14 03:20:36 2000
>+++ siag/Makefile	Thu Apr 20 12:36:28 2000
>@@ -8,3 +9,3 @@
> PORTNAME=	siag
>-PORTVERSION=	3.2.0
>+PORTVERSION=	3.3.3
> CATEGORIES=	math
>@@ -16,2 +17,3 @@
> LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \
>+		Magick:${PORTSDIR}/graphics/ImageMagick \
> 		Xpm.4:${PORTSDIR}/graphics/xpm
>@@ -22,5 +24,5 @@
> GNU_CONFIGURE=	yes
>-MAKEFLAGS=	"-j 2"
>+MAKE_ARGS=	"-j 2"
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>+CPPFLAGS+=	-I${LOCALBASE}/include -DX11BASE='\"${X11BASE}\"'
> 
>@@ -31,3 +33,3 @@
> .if !defined(NOGDBM)
>-BUILD_DEPENDS+=	${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
>+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
> CPPFLAGS+=	-DGDBM
>@@ -36,3 +38,3 @@
> .if !defined(NOT1)
>-BUILD_DEPENDS+=	${LOCALBASE}/lib/libt1.a:${PORTSDIR}/devel/t1lib
>+LIB_DEPENDS+=	t1:${PORTSDIR}/devel/t1lib
> .endif
>@@ -52,3 +54,4 @@
> 
>-MAN1=	xedplus.1 xfiler.1 gvu.1 siod.1 siag.1 pw.1 egon.1 dummy_plugin.1
>+MAN1=	xedplus.1 xfiler.1 gvu.1 siod.1 siag.1 pw.1 egon.1 \
>+	dummy_plugin.1 runcmd.1
> 
>@@ -59,3 +62,3 @@
> 	# users'  PATH  it  may  or  may  not  interfere  with  simple
>-	# invocation of /usr/sbin/pw.
>+	# invocation of pw(8) (which is in /usr/sbin).
> 	@test -e ${PREFIX}/lib/X11/app-defaults/Siag && ${ECHO} \
>@@ -72,2 +75,6 @@
> 	done
>+	# Fixing configure to look for Xaw3d instead of XawM
>+	${MV} ${WRKSRC}/configure ${WRKSRC}/configure.XawM
>+	${SED} s/XawM/Xaw3d/g < ${WRKSRC}/configure.XawM > ${WRKSRC}/configure
>+	${CHMOD} +x ${WRKSRC}/configure
> 
>diff -N -P -U1 -r siag/files/md5 siag/files/md5
>--- siag/files/md5	Sat Feb 26 21:33:07 2000
>+++ siag/files/md5	Fri Apr 14 16:11:46 2000
>@@ -1 +1 @@
>-MD5 (siag-3.2.0.tar.gz) = 5c68a568b4450e41f242d9ea873b7a01
>+MD5 (siag-3.3.3.tar.gz) = 0c7e2e3c1221185c64d695175f211574
>diff -N -P -U1 -r siag/patches/patch-pw siag/patches/patch-pw
>--- siag/patches/patch-pw	Wed Dec 31 19:00:00 1969
>+++ siag/patches/patch-pw	Thu Apr 20 10:32:21 2000
>@@ -0,0 +1,28 @@
>+--- xpw/window.c	Wed Mar 29 17:20:52 2000
>++++ xpw/window.c	Thu Apr 20 09:00:18 2000
>+@@ -1386,3 +1386,3 @@
>+                 if (!fork()) {
>+-                        execlp("pw", "Pw", filename, (char *)0);
>++                        execlp(X11BASE"/bin/pw", "Pw", filename, (char *)0);
>+                         exit(1);
>+--- pw/pw.scm	Fri Apr 14 17:05:47 2000
>++++ pw/pw.scm	Thu Apr 20 08:50:02 2000
>+@@ -139,3 +139,3 @@
>+ (define (new-buffer)
>+-  (spawn "pw"))
>++  (spawn (string-append datadir "/../../bin/pw"))
>+ 
>+--- plugins/plugin.scm	Mon May  3 04:26:05 1999
>++++ plugins/plugin.scm	Thu Apr 20 08:51:31 2000
>+@@ -16,3 +16,3 @@
>+ (plugin-register "Pathetic Writer" "pw"
>+-	"pw -plugin -geometry 400x300+4000+4000 %s")
>++	(string-append datadir "/../../bin/pw -plugin -geometry 400x300+4000+4000 %s")
>+ (plugin-register "Egon Animator" "egon"
>+--- common/tools.scm	Thu Apr  6 08:53:09 2000
>++++ common/tools.scm	Thu Apr 20 09:14:13 2000
>+@@ -12,3 +12,3 @@
>+ (if (stat (string-append datadir "/pw/pw.scm"))
>+-  (add-menu-entry "Tools" "Pathetic Writer" "(spawn \"pw\")"))
>++  (add-menu-entry "Tools" "Pathetic Writer" "(spawn (string-append datadir \"/../../bin/pw\"))"))
>+ (if (stat (string-append datadir "/siag/siag.scm"))
>diff -N -P -U1 -r siag/pkg/PLIST siag/pkg/PLIST
>--- siag/pkg/PLIST	Sat Feb 26 21:33:09 2000
>+++ siag/pkg/PLIST	Thu Apr 20 10:57:39 2000
>@@ -10,2 +10,7 @@
> share/siag/siod/siod.scm
>+share/siag/common/dictionary.cs
>+share/siag/common/dictionary.gl
>+share/siag/common/dictionary.ru
>+share/siag/common/fonts.txt
>+share/siag/common/rgb.txt
> share/siag/common/bitmaps/blank.xpm
>@@ -137,6 +142,4 @@
> share/siag/common/readpfa
>-share/siag/common/colors.scm
> share/siag/common/common.scm
> share/siag/common/position.scm
>-share/siag/common/fonts.scm
> share/siag/common/tools.scm
>@@ -366,2 +369,18 @@
> share/doc/siag/README
>+share/applnk/Siag Office/Siag.kdelnk
>+share/applnk/Siag Office/PW.kdelnk
>+share/applnk/Siag Office/Egon.kdelnk
>+share/applnk/Siag Office/Xedplus.kdelnk
>+share/applnk/Siag Office/Xfiler.kdelnk
>+share/applnk/Siag Office/Gvu.kdelnk
>+share/icons/siag.xpm
>+share/icons/pw.xpm
>+share/icons/egon.xpm
>+share/icons/xedplus.xpm
>+share/icons/xfiler.xpm
>+share/icons/gvu.xpm
>+share/mimelnk/application/x-siag.kdelnk
>+share/mimelnk/application/x-pw.kdelnk
>+share/mimelnk/application/x-egon.kdelnk
>+@dirrm share/applnk/Siag Office
> @dirrm share/siag/common/bitmaps/kde
>diff -N -P -U1 -r siag/scripts/post-patch siag/scripts/post-patch
>--- siag/scripts/post-patch	Wed Dec 31 19:00:00 1969
>+++ siag/scripts/post-patch	Thu Apr 20 10:31:48 2000
>@@ -0,0 +1,9 @@
>+patch -d ${WRKSRC} -p << EOPATCH
>+--- xpw/PW.kdelnk.orig	Mon Jul 12 04:15:52 1999
>++++ xpw/PW.kdelnk	Thu Apr 20 09:41:46 2000
>+@@ -7,3 +7,3 @@
>+ MimeType=application/x-pw;
>+-Exec=pw %f
>++Exec=${X11BASE}/bin/pw %f
>+ Icon=pw.xpm
>+EOPATCH

Actions: View | Diff

Attachments on bug 18117: 8709