From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 18 00:40:15 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7AD8016A412 for ; Thu, 18 Jan 2007 00:40:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 5A30F13C44C for ; Thu, 18 Jan 2007 00:40:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0I0eFav060469 for ; Thu, 18 Jan 2007 00:40:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0I0eFVK060468; Thu, 18 Jan 2007 00:40:15 GMT (envelope-from gnats) Resent-Date: Thu, 18 Jan 2007 00:40:15 GMT Resent-Message-Id: <200701180040.l0I0eFVK060468@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Eric P. Scott" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6F2EB16A407 for ; Thu, 18 Jan 2007 00:31:22 +0000 (UTC) (envelope-from eps@anna.ana.com) Received: from anna.ana.com (anna.ana.com [208.69.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id 3E84013C442 for ; Thu, 18 Jan 2007 00:31:22 +0000 (UTC) (envelope-from eps@anna.ana.com) Received: from anna.ana.com (localhost [127.0.0.1]) by anna.ana.com (8.13.8/8.13.8) with ESMTP id l0I0cAHI029470 for ; Wed, 17 Jan 2007 16:38:10 -0800 (PST) Received: (from eps@localhost) by anna.ana.com (8.13.8/8.13.8/Submit) id l0I0c9KC029468; Wed, 17 Jan 2007 16:38:09 -0800 (PST) Message-Id: <200701180038.l0I0c9KC029468@anna.ana.com> Date: Wed, 17 Jan 2007 16:38:09 -0800 (PST) From: "Eric P. Scott" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/108064: sysutils/isomaster: upgrade to 0.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Eric P. Scott" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2007 00:40:15 -0000 >Number: 108064 >Category: ports >Synopsis: sysutils/isomaster: upgrade to 0.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jan 18 00:40:14 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Eric P. Scott >Release: FreeBSD 4.11-SECURITY i386 >Organization: ana-systems, Inc. >Environment: System: FreeBSD fourever 4.11-SECURITY FreeBSD 4.11-SECURITY #0: Mon Dec 4 00:19:59 GMT 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Upgrade to 0.7; honor WITHOUT_NLS; unbreak for 4.x >How-To-Repeat: >Fix: diff -ruN /usr/ports/sysutils/isomaster/Makefile sysutils/isomaster/Makefile --- /usr/ports/sysutils/isomaster/Makefile Sat Dec 16 01:45:53 2006 +++ sysutils/isomaster/Makefile Wed Jan 17 16:10:11 2007 @@ -6,8 +6,7 @@ # PORTNAME= isomaster -PORTVERSION= 0.6 -PORTREVISION= 1 +PORTVERSION= 0.7 CATEGORIES= sysutils MASTER_SITES= http://littlesvr.ca/isomaster/releases/ @@ -15,17 +14,24 @@ COMMENT= GTK2 (bootable) CD ISO Image editor USE_BZIP2= yes -WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gtk20 pkgconfig intlhack gnomehier USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_ICON= yes -ALL_TARGET= ${PORTNAME} MAKE_ENV= PREFIX=${PREFIX} +MAKE_ARGS= CFLAGS="${CFLAGS}" CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \ - -D_FILE_OFFSET_BITS=64 \ - `pkg-config --cflags gtk+-2.0` + `pkg-config --cflags gtk+-2.0` \ + -DICONPATH=\\\"${DATADIR}/icons\\\" +.if !defined(WITHOUT_NLS) +CFLAGS+= -DLOCALEDIR=\\\"${PREFIX}/share/locale\\\" +PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " +.endif + +MAN1= isomaster.1 post-install: ${MKDIR} ${PREFIX}/share/applications @@ -33,10 +39,4 @@ ${MKDIR} ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/isomaster.png ${PREFIX}/share/pixmaps/isomaster.png -.include - -.if ${OSVERSION} < 500000 -BROKEN= does not compile on 4.x -.endif - -.include +.include diff -ruN /usr/ports/sysutils/isomaster/distinfo sysutils/isomaster/distinfo --- /usr/ports/sysutils/isomaster/distinfo Tue Dec 12 04:39:56 2006 +++ sysutils/isomaster/distinfo Thu Jan 11 14:18:10 2007 @@ -1,3 +1,3 @@ -MD5 (isomaster-0.6.tar.bz2) = a098b7879fe109cc28fa501050998446 -SHA256 (isomaster-0.6.tar.bz2) = b2e14c090000ca01df9962ae1f986454467ebfa774729a9279459d578eff7f1c -SIZE (isomaster-0.6.tar.bz2) = 151174 +MD5 (isomaster-0.7.tar.bz2) = ecc0a033211bb61c18a0bdde5612f2c9 +SHA256 (isomaster-0.7.tar.bz2) = f72472173be1c69ce74249a956fe7cad80ce0563a97dd0cbc1fa098a24c851d7 +SIZE (isomaster-0.7.tar.bz2) = 161558 diff -ruN /usr/ports/sysutils/isomaster/files/patch-Makefile sysutils/isomaster/files/patch-Makefile --- /usr/ports/sysutils/isomaster/files/patch-Makefile Tue Dec 12 04:39:56 2006 +++ sysutils/isomaster/files/patch-Makefile Wed Jan 17 16:05:18 2007 @@ -1,11 +1,28 @@ ---- Makefile.orig Tue Dec 12 12:08:11 2006 -+++ Makefile Tue Dec 12 12:08:20 2006 -@@ -24,7 +24,7 @@ - GTKLIBS = `pkg-config --libs gtk+-2.0` - GTKFLAGS = `pkg-config --cflags gtk+-2.0` - # the _FILE_OFFSET_BITS=64 is to enable stat() for large files --GLOBALFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -+GLOBALFLAGS = ${CFLAGS} - GLOBALDEPS = bk/bk.h Makefile +--- Makefile.orig Thu Jan 11 16:37:43 2007 ++++ Makefile +@@ -47,7 +47,7 @@ - isomaster: lib iniparser translations isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o $(GLOBALDEPS) + OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o + +-all: lib iniparser translations isomaster man ++all: lib iniparser translations isomaster + + isomaster: $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a + $(CC) $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0`-o isomaster +@@ -92,14 +92,14 @@ + cd po && $(MAKE) install + endif + $(INSTALL) -d $(DESTDIR)$(MYMANPATH) +- $(INSTALL) -m 644 isomaster.1.gz $(DESTDIR)$(MYMANPATH) ++ $(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH) + + uninstall: + $(RM) $(DESTDIR)$(BINPATH)/isomaster + $(RM) $(DESTDIR)$(ICONPATH)/isomaster.png + $(RM) $(DESTDIR)$(ICONPATH)/folder-new-tango.png + $(RM) $(DESTDIR)$(ICONPATH)/add2-kearone.png +- $(RM) $(DESTDIR)$(ICONPATH)/extract-kearone.png ++ $(RM) $(DESTDIR)$(ICONPATH)/extract2-kearone.png + ifndef WITHOUT_NLS + cd po && $(MAKE) uninstall + endif diff -ruN /usr/ports/sysutils/isomaster/files/patch-bk-Makefile sysutils/isomaster/files/patch-bk-Makefile --- /usr/ports/sysutils/isomaster/files/patch-bk-Makefile Tue Dec 12 04:39:56 2006 +++ sysutils/isomaster/files/patch-bk-Makefile Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- bk/Makefile.orig Tue Dec 12 12:11:07 2006 -+++ bk/Makefile Tue Dec 12 12:11:22 2006 -@@ -2,7 +2,7 @@ - GLOBALDEPS = Makefile bk.h - # the _FILE_OFFSET_BITS=64 is to enable stat() for large files - # DEBUG and -g only used during development --GLOBALFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -+GLOBALFLAGS = ${CFLAGS} - - bk.a: $(OBJECTS) - ar -cr bk.a $(OBJECTS) diff -ruN /usr/ports/sysutils/isomaster/files/patch-bk.h sysutils/isomaster/files/patch-bk.h --- /usr/ports/sysutils/isomaster/files/patch-bk.h Tue Dec 12 04:39:56 2006 +++ sysutils/isomaster/files/patch-bk.h Wed Dec 31 16:00:00 1969 @@ -1,10 +0,0 @@ ---- bk/bk.h.orig Mon Dec 11 15:55:38 2006 -+++ bk/bk.h Mon Dec 11 15:56:01 2006 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - - #include "bkError.h" - diff -ruN /usr/ports/sysutils/isomaster/files/patch-bkExtract.c sysutils/isomaster/files/patch-bkExtract.c --- /usr/ports/sysutils/isomaster/files/patch-bkExtract.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-bkExtract.c Wed Jan 17 14:56:26 2007 @@ -0,0 +1,10 @@ +--- bk/bkExtract.c.orig Sun Jan 7 20:00:36 2007 ++++ bk/bkExtract.c +@@ -223,6 +223,7 @@ + else + { + printf("trying to extract something that's not a file or directory, ignored\n");fflush(NULL); ++ rc = BKERROR_WRONG_EXTRACT_FILE; + } + + if(rc <= 0) diff -ruN /usr/ports/sysutils/isomaster/files/patch-bkPath.c sysutils/isomaster/files/patch-bkPath.c --- /usr/ports/sysutils/isomaster/files/patch-bkPath.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-bkPath.c Wed Jan 17 14:56:11 2007 @@ -0,0 +1,34 @@ +--- bk/bkPath.c.orig Sun Jan 7 20:00:36 2007 ++++ bk/bkPath.c +@@ -110,7 +110,7 @@ + int count; + int srcLen; + int lastCharIndex; +- int firstCharIndex; ++ int firstCharIndex=0; + bool lastCharFound; + int count2; + +@@ -162,6 +162,9 @@ + { + int count; + int pathStrLen; ++ int numChildrenDone; ++ int nextChildLen; ++ const char* nextChild; + + pathStrLen = strlen(strPath); + +@@ -186,9 +189,9 @@ + if(pathPath->children == NULL) + return BKERROR_OUT_OF_MEMORY; + +- int numChildrenDone = 0; +- int nextChildLen = 0; +- const char* nextChild = &(strPath[1]); ++ numChildrenDone = 0; ++ nextChildLen = 0; ++ nextChild = &(strPath[1]); + for(count = 1; count <= pathStrLen; count++) + { + if(strPath[count] == '/' || (strPath[count] == '\0' && strPath[count - 1] != '/')) diff -ruN /usr/ports/sysutils/isomaster/files/patch-bkRead.c sysutils/isomaster/files/patch-bkRead.c --- /usr/ports/sysutils/isomaster/files/patch-bkRead.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-bkRead.c Wed Jan 17 14:55:57 2007 @@ -0,0 +1,42 @@ +--- bk/bkRead.c.orig Thu Dec 28 16:48:10 2006 ++++ bk/bkRead.c +@@ -46,6 +46,7 @@ + { + int rc; + struct stat statStruct; ++ int len; + + volInfo->imageForReading = open(filename, O_RDONLY); + if(volInfo->imageForReading == -1) +@@ -62,7 +63,7 @@ + volInfo->imageForReadingInode = statStruct.st_ino; + + /* skip the first 150 sectors if the image is an NRG */ +- int len = strlen(filename); ++ len = strlen(filename); + if( (filename[len - 3] == 'N' || filename[len - 3] == 'n') && + (filename[len - 2] == 'R' || filename[len - 2] == 'r') && + (filename[len - 1] == 'G' || filename[len - 1] == 'g') ) +@@ -105,6 +106,11 @@ + unsigned realRootLoc; /* location of the root dr inside root dir */ + unsigned char recordLen; /* length of rood dr */ + unsigned char sPsUentry[7]; /* su entry SP */ ++ ++ off_t locationOfNextDescriptor; ++ unsigned bootCatalogLocation; /* logical sector number */ ++ char elToritoSig[24]; ++ unsigned char bootMediaType; + + /* will always have this unless image is broken */ + volInfo->filenameTypes = FNTYPE_9660; +@@ -224,10 +230,6 @@ + /* END SKIP all extra copies of pvd */ + + /* TRY read boot record */ +- off_t locationOfNextDescriptor; +- unsigned bootCatalogLocation; /* logical sector number */ +- char elToritoSig[24]; +- unsigned char bootMediaType; + + locationOfNextDescriptor = lseek(volInfo->imageForReading, 0, SEEK_CUR) + 2048; + diff -ruN /usr/ports/sysutils/isomaster/files/patch-bkSort.c sysutils/isomaster/files/patch-bkSort.c --- /usr/ports/sysutils/isomaster/files/patch-bkSort.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-bkSort.c Wed Jan 17 14:55:18 2007 @@ -0,0 +1,56 @@ +--- bk/bkSort.c.orig Sat Dec 23 17:55:20 2006 ++++ bk/bkSort.c +@@ -26,7 +26,7 @@ + int rightLen; + int count; + bool resultFound; +- bool rc; ++ bool rc=false; + + leftLen = strlen(leftStr); + rightLen = strlen(rightStr); +@@ -61,6 +61,8 @@ + void sortDir(DirToWrite* dir, int filenameType) + { + BaseToWrite* child; ++ BaseToWrite** outerPtr; ++ BaseToWrite** innerPtr; + + child = dir->children; + while(child != NULL) +@@ -71,9 +73,6 @@ + child = child->next; + } + +- BaseToWrite** outerPtr; +- BaseToWrite** innerPtr; +- + outerPtr = &(dir->children); + while(*outerPtr != NULL) + { +@@ -90,19 +89,23 @@ + + if( (*outerPtr)->next != *innerPtr ) + { ++ BaseToWrite* oldInnerNext; ++ + *outerPtr = inner; + *innerPtr = outer; + +- BaseToWrite* oldInnerNext = inner->next; ++ oldInnerNext = inner->next; + inner->next = outer->next; + outer->next = oldInnerNext; + } + else + { ++ BaseToWrite* oldInnerNext = inner->next; ++ + *outerPtr = inner; + innerPtr = &(inner->next); + +- BaseToWrite* oldInnerNext = inner->next; ++ oldInnerNext = inner->next; + inner->next = outer; + outer->next = oldInnerNext; + } diff -ruN /usr/ports/sysutils/isomaster/files/patch-boot.c sysutils/isomaster/files/patch-boot.c --- /usr/ports/sysutils/isomaster/files/patch-boot.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-boot.c Wed Jan 17 14:39:50 2007 @@ -0,0 +1,28 @@ +--- boot.c.orig Thu Jan 11 16:42:31 2007 ++++ boot.c Wed Jan 17 14:35:49 2007 +@@ -48,10 +48,11 @@ + + if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + { ++ char* lastBootRecordDir; + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + + /* RECORD last boot record dir */ +- char* lastBootRecordDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); ++ lastBootRecordDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); + + if(GBLappSettings.lastBootRecordDir != NULL && + strlen(lastBootRecordDir) > strlen(GBLappSettings.lastBootRecordDir)) +@@ -162,10 +163,11 @@ + + if(dialogResponse == GTK_RESPONSE_ACCEPT) + { ++ char* lastBootRecordDir; + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + + /* RECORD last boot record dir */ +- char* lastBootRecordDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); ++ lastBootRecordDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); + + if(GBLappSettings.lastBootRecordDir != NULL && + strlen(lastBootRecordDir) > strlen(GBLappSettings.lastBootRecordDir)) diff -ruN /usr/ports/sysutils/isomaster/files/patch-fsbrowser.c sysutils/isomaster/files/patch-fsbrowser.c --- /usr/ports/sysutils/isomaster/files/patch-fsbrowser.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-fsbrowser.c Wed Jan 17 14:39:50 2007 @@ -0,0 +1,18 @@ +--- fsbrowser.c.orig Thu Dec 28 05:44:19 2006 ++++ fsbrowser.c Wed Jan 17 14:27:07 2007 +@@ -419,6 +419,7 @@ + void refreshFsView(void) + { + char* fsCurrentDir; /* for changeFsDirectory() */ ++ GdkRectangle visibleRect; + + fsCurrentDir = malloc(strlen(GBLfsCurrentDir) + 1); + if(fsCurrentDir == NULL) +@@ -426,7 +427,6 @@ + strcpy(fsCurrentDir, GBLfsCurrentDir); + + /* remember scroll position */ +- GdkRectangle visibleRect; + gtk_tree_view_get_visible_rect(GTK_TREE_VIEW(GBLfsTreeView), &visibleRect); + + changeFsDirectory(fsCurrentDir); diff -ruN /usr/ports/sysutils/isomaster/files/patch-isobrowser.c sysutils/isomaster/files/patch-isobrowser.c --- /usr/ports/sysutils/isomaster/files/patch-isobrowser.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-isobrowser.c Wed Jan 17 14:39:50 2007 @@ -0,0 +1,108 @@ +--- isobrowser.c.orig Sun Jan 7 14:11:34 2007 ++++ isobrowser.c Wed Jan 17 14:31:16 2007 +@@ -57,6 +57,7 @@ + void addToIsoCbk(GtkButton *button, gpointer data) + { + GtkTreeSelection* selection; ++ char sizeStr[20]; + + if(!GBLisoPaneActive) + /* no iso open */ +@@ -73,7 +74,6 @@ + } + + /* iso size label */ +- char sizeStr[20]; + GBLisoSize = 35845; + //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET) + GBLisoSize += 2048; +@@ -354,6 +354,7 @@ + void deleteFromIsoCbk(GtkButton *button, gpointer data) + { + GtkTreeSelection* selection; ++ char sizeStr[20]; + + if(!GBLisoPaneActive) + /* no iso open */ +@@ -370,7 +371,6 @@ + } + + /* iso size label */ +- char sizeStr[20]; + GBLisoSize = 35845; + //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET) + GBLisoSize += 2048; +@@ -712,6 +712,7 @@ + { + int rc; + GtkWidget* warningDialog; ++ char sizeStr[20]; + + if(GBLisoChangesProbable && !confirmCloseIso()) + return TRUE; +@@ -738,7 +739,6 @@ + GBLappSettings.filenameTypesToWrite = FNTYPE_9660 | FNTYPE_ROCKRIDGE | FNTYPE_JOLIET; + + /* iso size label */ +- char sizeStr[20]; + GBLisoSize = 35845; + //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET) + GBLisoSize += 2048; +@@ -763,6 +763,7 @@ + { + int rc; + GtkWidget* warningDialog; ++ char sizeStr[20]; + + closeIso(); + +@@ -840,7 +841,6 @@ + /* END READ entire directory tree */ + + /* iso size label */ +- char sizeStr[20]; + GBLisoSize = 35845; + //if(GBLvolInfo.filenameTypes & FNTYPE_JOLIET) + GBLisoSize += 2048; +@@ -896,10 +896,11 @@ + + if(dialogRespose == GTK_RESPONSE_ACCEPT) + { ++ char* lastIsoDir; + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + + /* RECORD last iso dir */ +- char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); ++ lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); + + if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir)) + { +@@ -955,6 +956,7 @@ + void refreshIsoView(void) + { + char* isoCurrentDir; /* for changeIsoDirectory() */ ++ GdkRectangle visibleRect; + + isoCurrentDir = malloc(strlen(GBLisoCurrentDir) + 1); + if(isoCurrentDir == NULL) +@@ -963,7 +965,6 @@ + strcpy(isoCurrentDir, GBLisoCurrentDir); + + /* remember scroll position */ +- GdkRectangle visibleRect; + gtk_tree_view_get_visible_rect(GTK_TREE_VIEW(GBLisoTreeView), &visibleRect); + + changeIsoDirectory(isoCurrentDir); +@@ -1083,10 +1084,11 @@ + + if(dialogResponse == GTK_RESPONSE_ACCEPT) + { ++ char* lastIsoDir; + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + + /* RECORD last iso dir */ +- char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); ++ lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog)); + + if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir)) + { diff -ruN /usr/ports/sysutils/isomaster/files/patch-settings.c sysutils/isomaster/files/patch-settings.c --- /usr/ports/sysutils/isomaster/files/patch-settings.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-settings.c Wed Jan 17 14:39:50 2007 @@ -0,0 +1,30 @@ +--- settings.c.orig Thu Jan 11 16:37:43 2007 ++++ settings.c Wed Jan 17 14:34:49 2007 +@@ -165,6 +165,7 @@ + { + char* userHomeDir; + int pathLen; ++ DIR* openDirTest; + + userHomeDir = getenv("HOME"); + if(userHomeDir == NULL) +@@ -181,7 +182,6 @@ + } + + /* MAKE sure userHomeDir is a valid directory */ +- DIR* openDirTest; + + openDirTest = opendir(userHomeDir); + if(openDirTest == NULL) +@@ -222,9 +222,9 @@ + GBLsettingsDictionary = iniparser_load(configFileName); + if(GBLsettingsDictionary == NULL) + { +- printWarning("failed to open config file for reading, trying to create"); +- + int newConfigFile; ++ ++ printWarning("failed to open config file for reading, trying to create"); + + newConfigFile = creat(configFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if(newConfigFile <= 0) diff -ruN /usr/ports/sysutils/isomaster/files/patch-window.c sysutils/isomaster/files/patch-window.c --- /usr/ports/sysutils/isomaster/files/patch-window.c Wed Dec 31 16:00:00 1969 +++ sysutils/isomaster/files/patch-window.c Wed Jan 17 14:39:50 2007 @@ -0,0 +1,21 @@ +--- window.c.orig Sun Jan 7 16:08:02 2007 ++++ window.c Wed Jan 17 14:26:01 2007 +@@ -73,6 +73,8 @@ + guint accelKey; + GdkModifierType accelModifier; + GClosure *closure = NULL; ++ GtkWidget* submenu; ++ GtkWidget* rootSubmenu; + + /* KEYBOARD accelerators */ + accelGroup = gtk_accel_group_new(); +@@ -222,9 +224,6 @@ + gtk_widget_show(menuItem); + g_signal_connect(G_OBJECT(menuItem), "activate", + G_CALLBACK(deleteBootRecordCbk), NULL); +- +- GtkWidget* submenu; +- GtkWidget* rootSubmenu; + + rootSubmenu = gtk_image_menu_item_new_from_stock(GTK_STOCK_ADD, NULL); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), rootSubmenu); diff -ruN /usr/ports/sysutils/isomaster/pkg-plist sysutils/isomaster/pkg-plist --- /usr/ports/sysutils/isomaster/pkg-plist Sat Dec 16 01:45:53 2006 +++ sysutils/isomaster/pkg-plist Wed Jan 17 15:50:52 2007 @@ -1,9 +1,16 @@ bin/isomaster share/applications/isomaster.desktop %%DATADIR%%/icons/add2-kearone.png -%%DATADIR%%/icons/extract-kearone.png +%%DATADIR%%/icons/extract2-kearone.png %%DATADIR%%/icons/folder-new-tango.png %%DATADIR%%/icons/isomaster.png +%%NLS%%share/locale/bg/LC_MESSAGES/isomaster.mo +%%NLS%%share/locale/de/LC_MESSAGES/isomaster.mo +%%NLS%%share/locale/fr/LC_MESSAGES/isomaster.mo +%%NLS%%share/locale/pl/LC_MESSAGES/isomaster.mo +%%NLS%%share/locale/ru/LC_MESSAGES/isomaster.mo +%%NLS%%share/locale/sq/LC_MESSAGES/isomaster.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/isomaster.mo share/pixmaps/isomaster.png @dirrmtry share/pixmaps @dirrm %%DATADIR%%/icons >Release-Note: >Audit-Trail: >Unformatted: