- Update to 0.71

Approved by:            maintainer implicit

12 files changed, 10 insertions, 357 deletions

diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index c2b5841615d5..e71bec31ef5f 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	isomaster
-PORTVERSION=	0.7
+PORTVERSION=	0.7.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://littlesvr.ca/isomaster/releases/
 
@@ -31,8 +31,6 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-MAN1=		isomaster.1
-
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FILESDIR}/isomaster.desktop ${PREFIX}/share/applications
diff --git a/sysutils/isomaster/distinfo b/sysutils/isomaster/distinfo
index e70a5f9b2406..169a36158c8e 100644
--- a/sysutils/isomaster/distinfo
+++ b/sysutils/isomaster/distinfo
@@ -1,3 +1,3 @@
-MD5 (isomaster-0.7.tar.bz2) = ecc0a033211bb61c18a0bdde5612f2c9
-SHA256 (isomaster-0.7.tar.bz2) = f72472173be1c69ce74249a956fe7cad80ce0563a97dd0cbc1fa098a24c851d7
-SIZE (isomaster-0.7.tar.bz2) = 161558
+MD5 (isomaster-0.7.1.tar.bz2) = abc8b7bcd415084ace00854cca6248f0
+SHA256 (isomaster-0.7.1.tar.bz2) = 4caeb25be0a5d4cd18028469387fce5e15009304296c162b238f199b66f1c78a
+SIZE (isomaster-0.7.1.tar.bz2) = 161217
diff --git a/sysutils/isomaster/files/patch-Makefile b/sysutils/isomaster/files/patch-Makefile
index e961caeecb9e..735249aeb67d 100644
--- a/sysutils/isomaster/files/patch-Makefile
+++ b/sysutils/isomaster/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	Thu Jan 11 16:37:43 2007
+--- Makefile.orig
 +++ Makefile
 @@ -47,7 +47,7 @@
  
@@ -9,12 +9,14 @@
  
  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 @@
+@@ -91,15 +91,15 @@
+ ifndef WITHOUT_NLS
  	cd po && $(MAKE) install
  endif
- 	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
+-	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
 -	$(INSTALL) -m 644 isomaster.1.gz $(DESTDIR)$(MYMANPATH)
-+	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
++#	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
++#	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
  
  uninstall: 
  	$(RM) $(DESTDIR)$(BINPATH)/isomaster
diff --git a/sysutils/isomaster/files/patch-bkExtract.c b/sysutils/isomaster/files/patch-bkExtract.c
deleted file mode 100644
index a176e75a5d62..000000000000
--- a/sysutils/isomaster/files/patch-bkExtract.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-bkPath.c b/sysutils/isomaster/files/patch-bkPath.c
deleted file mode 100644
index a4f3cf4f2c8b..000000000000
--- a/sysutils/isomaster/files/patch-bkPath.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-bkRead.c b/sysutils/isomaster/files/patch-bkRead.c
deleted file mode 100644
index fd3def7608f0..000000000000
--- a/sysutils/isomaster/files/patch-bkRead.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-bkSort.c b/sysutils/isomaster/files/patch-bkSort.c
deleted file mode 100644
index 1b849206cfd2..000000000000
--- a/sysutils/isomaster/files/patch-bkSort.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-boot.c b/sysutils/isomaster/files/patch-boot.c
deleted file mode 100644
index b74cec471363..000000000000
--- a/sysutils/isomaster/files/patch-boot.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-fsbrowser.c b/sysutils/isomaster/files/patch-fsbrowser.c
deleted file mode 100644
index 32fdefc9f529..000000000000
--- a/sysutils/isomaster/files/patch-fsbrowser.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-isobrowser.c b/sysutils/isomaster/files/patch-isobrowser.c
deleted file mode 100644
index 16fb70bb66d7..000000000000
--- a/sysutils/isomaster/files/patch-isobrowser.c
+++ /dev/null
@@ -1,108 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-settings.c b/sysutils/isomaster/files/patch-settings.c
deleted file mode 100644
index 989081d8294a..000000000000
--- a/sysutils/isomaster/files/patch-settings.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 --git a/sysutils/isomaster/files/patch-window.c b/sysutils/isomaster/files/patch-window.c
deleted file mode 100644
index bb6ce9a523c9..000000000000
--- a/sysutils/isomaster/files/patch-window.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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);