Date: Mon, 22 Oct 2001 19:30:01 -0700 (PDT) From: KANOU Hiroki <kanou@mil.allnet.ne.jp> To: freebsd-ports@FreeBSD.org Subject: Re: ports/31400: Maintainer update: print/pfaedit Message-ID: <200110230230.f9N2U1b33682@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/31400; it has been noted by GNATS. From: KANOU Hiroki <kanou@mil.allnet.ne.jp> To: FreeBSD-gnats-submit@freebsd.org Cc: FUJISHIMA Satsuki <sf@freebsd.org>, kanou@mil.allnet.ne.jp Subject: Re: ports/31400: Maintainer update: print/pfaedit Date: Tue, 23 Oct 2001 11:21:29 +0900 >Submitter-Id: current-users >Originator: KANOU Hiroki >Confidential: no >Synopsis: Maintaner update: print/pfaedit >Severity: serious >Priority: low >Category: ports >Class: maintainer-update >Release: FreeBSD 4.4-STABLE i386 >Description: PfaEdit port updated by maintainer. Unfetchable files are fixed. This patch is based on a version newer than PR ports/31400 and overrides it. >How-To-Repeat: Apply this patch by 'patch -E -p1' at /usr/ports/print/pfaedit and remove backup files. >Fix: diff -Nru pfaedit.orig/Makefile pfaedit/Makefile --- pfaedit.orig/Makefile Tue Sep 11 11:59:19 2001 +++ pfaedit/Makefile Tue Oct 23 10:51:56 2001 @@ -6,7 +6,7 @@ # PORTNAME= pfaedit -PORTVERSION= 20010808 +PORTVERSION= 20011021 CATEGORIES= print MASTER_SITES= http://pfaedit.sourceforge.net/ DISTFILES= ${PORTNAME}_src-${DIST_VER}.tgz \ @@ -15,9 +15,9 @@ MAINTAINER= kanou@mil.allnet.ne.jp -DIST_VER= 010808 -LIBGDRAW_VER= 010808 -LIBGUNI_VER= 010808 +DIST_VER= 011021 +LIBGDRAW_VER= 011011 +LIBGUNI_VER= 011011 LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg \ diff -Nru pfaedit.orig/distinfo pfaedit/distinfo --- pfaedit.orig/distinfo Tue Aug 28 01:01:32 2001 +++ pfaedit/distinfo Tue Oct 23 10:52:56 2001 @@ -1,4 +1,4 @@ -MD5 (pfaedit_src-010808.tgz) = 5d6d99029a038e4930279cc882abfc2b +MD5 (pfaedit_src-011021.tgz) = 41e1e07253af7a8ddb0074796b868eac +MD5 (libgunicode-011011.tgz) = 25b7f13d768626599f979429f24f41d6 +MD5 (libgdraw-011011.tgz) = c95137c453f6c62aa3bb9b3dc098a0cb MD5 (cidmaps.tgz) = b2f5fd18ea3c8205e6923832505bf73b -MD5 (libgunicode-010808.tgz) = 4d45e6d0e772b12f5664a4064f9fbdf5 -MD5 (libgdraw-010808.tgz) = 6b5db477d345fdf72165d6248ab4534c diff -Nru pfaedit.orig/files/patch-aa pfaedit/files/patch-aa --- pfaedit.orig/files/patch-aa Tue Aug 28 01:01:35 2001 +++ pfaedit/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- pfaedit/encoding.c.orig Sat Aug 4 06:27:24 2001 -+++ pfaedit/encoding.c Thu Aug 23 19:21:17 2001 -@@ -683,7 +683,7 @@ - if ( file==NULL ) - file = SearchDirForCidMap(GResourceProgramDir,registry,ordering,supplement,&maybefile); - if ( file==NULL ) -- file = SearchDirForCidMap("/usr/share/pfaedit",registry,ordering,supplement,&maybefile); -+ file = SearchDirForCidMap("/usr/local/share/pfaedit",registry,ordering,supplement,&maybefile); - - if ( file==NULL && (maybe!=NULL || maybefile!=NULL)) { - if ( maybefile!=NULL ) { -@@ -864,7 +864,7 @@ - } - FindMapsInDir(&block,"."); - FindMapsInDir(&block,GResourceProgramDir); -- FindMapsInDir(&block,"/usr/share/pfaedit"); -+ FindMapsInDir(&block,"/usr/local/share/pfaedit"); - - choices = gcalloc(block.cur+2,sizeof(unichar_t *)); - choices[0] = u_copy(GStringGetResource(_STR_Browse,NULL)); diff -Nru pfaedit.orig/files/patch-ab pfaedit/files/patch-ab --- pfaedit.orig/files/patch-ab Tue Aug 28 01:01:35 2001 +++ pfaedit/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- pfaedit/prefs.c.orig Thu Aug 9 08:55:45 2001 -+++ pfaedit/prefs.c Thu Aug 23 19:22:49 2001 -@@ -134,7 +134,7 @@ - GFileBuildName(GResourceProgramDir,buffer,full,sizeof(full)); - } - if ( !GFileExists(full)) { -- GFileBuildName("/usr/share/pfaedit",buffer,full,sizeof(full)); -+ GFileBuildName("/usr/local/share/pfaedit",buffer,full,sizeof(full)); - if ( !GFileExists(full) && strlen(loc)>5 ) { - strcpy(buffer+13,".ui"); - GFileBuildName(GResourceProgramDir,buffer,full,sizeof(full)); diff -Nru pfaedit.orig/files/patch-encoding.c pfaedit/files/patch-encoding.c --- pfaedit.orig/files/patch-encoding.c Thu Jan 1 09:00:00 1970 +++ pfaedit/files/patch-encoding.c Tue Oct 23 10:51:34 2001 @@ -0,0 +1,20 @@ +--- pfaedit/encoding.c.orig Tue Sep 25 09:02:35 2001 ++++ pfaedit/encoding.c Wed Oct 10 14:24:12 2001 +@@ -704,7 +704,7 @@ + if ( file==NULL ) + file = SearchDirForCidMap(getPfaEditShareDir(),registry,ordering,supplement,&maybefile); + if ( file==NULL ) +- file = SearchDirForCidMap("/usr/share/pfaedit",registry,ordering,supplement,&maybefile); ++ file = SearchDirForCidMap("/usr/local/share/pfaedit",registry,ordering,supplement,&maybefile); + + if ( file==NULL && (maybe!=NULL || maybefile!=NULL)) { + if ( maybefile!=NULL ) { +@@ -893,7 +893,7 @@ + FindMapsInDir(&block,SHAREDIR); + #endif + FindMapsInDir(&block,getPfaEditShareDir()); +- FindMapsInDir(&block,"/usr/share/pfaedit"); ++ FindMapsInDir(&block,"/usr/local/share/pfaedit"); + + choices = gcalloc(block.cur+2,sizeof(unichar_t *)); + choices[0] = u_copy(GStringGetResource(_STR_Browse,NULL)); diff -Nru pfaedit.orig/files/patch-pfaedit.1 pfaedit/files/patch-pfaedit.1 --- pfaedit.orig/files/patch-pfaedit.1 Thu Jan 1 09:00:00 1970 +++ pfaedit/files/patch-pfaedit.1 Tue Oct 23 10:51:34 2001 @@ -0,0 +1,13 @@ +--- pfaedit/pfaedit.1.orig Tue Sep 25 00:16:49 2001 ++++ pfaedit/pfaedit.1 Wed Oct 10 14:24:32 2001 +@@ -50,8 +50,8 @@ + .It Pa ~/.PfaEdit/autosave/ + crash recovery directory + .El +-.Bl -tag -width /usr/share/pfaedit/*.ui -compact +-.It Pa /usr/share/pfaedit/*.ui ++.Bl -tag -width /usr/local/share/pfaedit/*.ui -compact ++.It Pa /usr/local/share/pfaedit/*.ui + translations for the user interface + .El + .Bl -tag -width *.cidmap -compact diff -Nru pfaedit.orig/files/patch-prefs.c pfaedit/files/patch-prefs.c --- pfaedit.orig/files/patch-prefs.c Thu Jan 1 09:00:00 1970 +++ pfaedit/files/patch-prefs.c Tue Oct 23 10:51:35 2001 @@ -0,0 +1,24 @@ +--- pfaedit/prefs.c.orig Tue Oct 2 02:24:39 2001 ++++ pfaedit/prefs.c Wed Oct 10 14:23:42 2001 +@@ -123,10 +123,10 @@ + pt = strstr(GResourceProgramDir,"/bin"); + if ( pt==NULL ) + return( NULL ); +- len = (pt-GResourceProgramDir)+strlen("/share/pfaedit")+1; ++ len = (pt-GResourceProgramDir)+strlen("/local/share/pfaedit")+1; + sharedir = galloc(len); + strncpy(sharedir,GResourceProgramDir,pt-GResourceProgramDir); +- strcpy(sharedir+(pt-GResourceProgramDir),"/share/pfaedit"); ++ strcpy(sharedir+(pt-GResourceProgramDir),"/local/share/pfaedit"); + return( sharedir ); + } + +@@ -180,7 +180,7 @@ + !CheckLangDir(full,sizeof(full),SHAREDIR,loc) && + #endif + !CheckLangDir(full,sizeof(full),getPfaEditShareDir(),loc) && +- !CheckLangDir(full,sizeof(full),"/usr/share/pfaedit",loc) ) ++ !CheckLangDir(full,sizeof(full),"/usr/local/share/pfaedit",loc) ) + return; + + GStringSetResourceFile(full); diff -Nru pfaedit.orig/pkg-descr pfaedit/pkg-descr --- pfaedit.orig/pkg-descr Sun May 20 02:09:56 2001 +++ pfaedit/pkg-descr Tue Oct 23 10:51:35 2001 @@ -7,4 +7,4 @@ For more Information, see -WWW: http://bibliofile.mc.duke.edu/gww/FreeWare/PfaEdit/ +WWW: http://PfaEdit.sourceforge.net/ 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?200110230230.f9N2U1b33682>