$OpenBSD$
--- Source/Markup/DecoderBackend/GSMarkupDecoderBackendCFXML.m.orig	Mon Feb 25 17:18:16 2013
+++ Source/Markup/DecoderBackend/GSMarkupDecoderBackendCFXML.m	Mon Feb 25 17:30:49 2013
@@ -106,10 +106,10 @@ Boolean GSMarkupHandleError
 {
   NSString *description = (NSString *)
     (CFXMLParserCopyErrorDescription (parser));
-  int lineNumber = (int)CFXMLParserGetLineNumber (parser);
-  int location = (int)CFXMLParserGetLocation (parser);
+  CFIndex lineNumber = CFXMLParserGetLineNumber (parser);
+  CFIndex location = CFXMLParserGetLocation (parser);
   
-  NSLog (@"XML DecoderBackend Fatal Error: %@, line: %d, location: %d",
+  NSLog (@"XML DecoderBackend Fatal Error: %@, line: %"PRIiPTR", location: %"PRIiPTR,
          description, lineNumber, location);
   
   RELEASE (description);
$OpenBSD$
--- Source/Markup/DecoderBackend/GSMarkupDecoderBackendGSXML.m.orig	Mon Feb 25 11:55:52 2013
+++ Source/Markup/DecoderBackend/GSMarkupDecoderBackendGSXML.m	Mon Feb 25 12:01:32 2013
@@ -59,7 +59,7 @@
 - (void) endDocument
 {}
 
-- (int) isStandalone
+- (NSInteger) isStandalone
 {
   return 1;
 }
@@ -113,7 +113,7 @@
 {}
 
 - (void) entityDecl: (NSString*)name
-	       type: (int)type
+	       type: (NSInteger)type
 	     public: (NSString*)publicId
 	     system: (NSString*)systemId
 	    content: (NSString*)content
@@ -127,7 +127,7 @@
 {}
 
 - (void) elementDecl: (NSString*)name
-		type: (int)type
+		type: (NSInteger)type
 {}
 
 - (void) unparsedEntityDecl: (NSString*)name
@@ -145,30 +145,30 @@
 {}
 
 - (void) warning: (NSString*)e
-       colNumber: (int)colNumber
-      lineNumber: (int)lineNumber
+       colNumber: (NSInteger)colNumber
+      lineNumber: (NSInteger)lineNumber
 {
-  NSLog (@"XML DecoderBackend Warning: %@, col: %d, line: %d", 
+  NSLog (@"XML DecoderBackend Warning: %@, col: %"PRIiPTR", line: %"PRIiPTR, 
 	 e, colNumber, lineNumber);
 }
 
 - (void) error: (NSString*)e
-     colNumber: (int)colNumber
-    lineNumber: (int)lineNumber
+     colNumber: (NSInteger)colNumber
+    lineNumber: (NSInteger)lineNumber
 {
-  NSLog (@"XML DecoderBackend Error: %@, col: %d, line: %d", 
+  NSLog (@"XML DecoderBackend Error: %@, col: %"PRIiPTR", line: %"PRIiPTR, 
 	 e, colNumber, lineNumber);
 }
 
 - (void) fatalError: (NSString*)e
-       colNumber: (int)colNumber
-      lineNumber: (int)lineNumber
+       colNumber: (NSInteger)colNumber
+      lineNumber: (NSInteger)lineNumber
 {
-  NSLog (@"XML DecoderBackend Fatal Error: %@, col: %d, line: %d", 
+  NSLog (@"XML DecoderBackend Fatal Error: %@, col: %"PRIiPTR", line: %"PRIiPTR, 
 	 e, colNumber, lineNumber);
 }
 
-- (int) hasInternalSubset
+- (NSInteger) hasInternalSubset
 {
   return 0;
 }
@@ -180,7 +180,7 @@
   return NO;
 }
 
-- (int) hasExternalSubset
+- (NSInteger) hasExternalSubset
 {
   return 0;
 }
$OpenBSD$
--- Source/Markup/DecoderBackend/GSMarkupDecoderBackendNSXML.m.orig	Mon Feb 25 17:16:44 2013
+++ Source/Markup/DecoderBackend/GSMarkupDecoderBackendNSXML.m	Mon Feb 25 17:18:03 2013
@@ -90,7 +90,7 @@ didStartElement: (NSString *)elementName 
 - (void) parser: (NSXMLParser *)parser
 parseErrorOccurred: (NSError *)e
 {
-  NSLog (@"XML DecoderBackend Fatal Error: %@, col: %d, line: %d", 
+  NSLog (@"XML DecoderBackend Fatal Error: %@, col: %"PRIiPTR", line: %"PRIiPTR, 
 	 e, [parser columnNumber], [parser lineNumber]);
 }
 
$OpenBSD$
--- Source/TagLibrary/GSMarkupTagBox.m.orig	Mon Feb 25 12:01:44 2013
+++ Source/TagLibrary/GSMarkupTagBox.m	Mon Feb 25 12:03:23 2013
@@ -189,7 +189,7 @@
 	  }
 	else
 	  {
-	    NSLog (@"Warning: Unrecognized value '%s' for box titlePosition attribute.  Ignored.", titlePosition);
+	    NSLog (@"Warning: Unrecognized value '%@' for box titlePosition attribute.  Ignored.", titlePosition);
 	  }
       }    
   }
@@ -218,7 +218,7 @@
 	  }
 	else
 	  {
-	    NSLog (@"Warning: Unrecognized value '%s' for box borderType attribute.  Ignored.", borderType);
+	    NSLog (@"Warning: Unrecognized value '%@' for box borderType attribute.  Ignored.", borderType);
 	  }
       }
     else
$OpenBSD$
--- Tools/GSMarkupLocalizableStrings.m.orig	Mon Feb 25 12:03:37 2013
+++ Tools/GSMarkupLocalizableStrings.m	Mon Feb 25 12:03:55 2013
@@ -63,7 +63,7 @@
 
   if (a)
     {
-      NSLog ([a description]);
+      NSLog (@"%@", [a description]);
       exit (0);
     }
   else