- update to 2.82

- remove no longer needed sparc64 workaround
- add graphics/jpeg RUN_DEPENDS (for jpegtran)
- simplify build
- remove MAINTAINER, as requested

ok xsa@ merdely@

graphics/jhead/Makefile

@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/15 20:09:41 simon Exp $
+# $OpenBSD: Makefile,v 1.9 2008/04/24 19:36:14 okan Exp $
 
 COMMENT=	Exif Jpeg camera setting parser and thumbnail remover
 
-DISTNAME=	jhead-2.6
+DISTNAME=	jhead-2.82
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.sentex.net/~mwandel/jhead/
 
-MAINTAINER=	Xavier Santolaria <xsa@openbsd.org>
-
 # public domain
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -20,14 +18,9 @@ MASTER_SITES=	${HOMEPAGE}
 
 NO_REGRESS=	Yes
 
-.if ${MACHINE_ARCH} == "sparc64"
-CFLAGS+=	-O0
-.endif
+RUN_DEPENDS=	::graphics/jpeg
 
-do-build:
-	cd ${WRKSRC} && \
-		${CC} ${CFLAGS} -o jhead exif.c jhead.c \
-		jpgfile.c makernote.c gpsinfo.c -lm
+MAKE_FILE=	makefile
 
 post-build:
 	@gzip -d ${WRKSRC}/jhead.1.gz 

graphics/jhead/distinfo

@@ -1,5 +1,5 @@
-MD5 (jhead-2.6.tar.gz) = +j8dMkP6t7w7gWiKPy7sJQ==
-RMD160 (jhead-2.6.tar.gz) = mf2ZIhIGMxGjyuSgXW7qx7eUb7w=
-SHA1 (jhead-2.6.tar.gz) = iPsD8069l73I0dkeNjPvoMik7Zg=
-SHA256 (jhead-2.6.tar.gz) = VaZSFMGfmmEmX97yGuTX9ZtyUkjQbAWVFSwUd0vTEGU=
-SIZE (jhead-2.6.tar.gz) = 56574
+MD5 (jhead-2.82.tar.gz) = 7y8yM+IroFTJC6MwaMsKcA==
+RMD160 (jhead-2.82.tar.gz) = dlYMTceGsu9VEJtY/P2ORNpkotQ=
+SHA1 (jhead-2.82.tar.gz) = gWwiFrBMu4TNCTlCexETd9naBFo=
+SHA256 (jhead-2.82.tar.gz) = nB7WGkBoLskvM2lKd9TpKQYqMOn4o8UFtKwD+d6VD+4=
+SIZE (jhead-2.82.tar.gz) = 62383

graphics/jhead/patches/patch-gpsinfo_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-gpsinfo_c,v 1.1 2006/05/29 17:40:24 sturm Exp $
---- gpsinfo.c.orig	Tue May 23 09:13:33 2006
-+++ gpsinfo.c	Tue May 23 09:13:52 2006
-@@ -152,7 +152,8 @@ void ProcessGpsInfo(unsigned char * DirS
+$OpenBSD: patch-gpsinfo_c,v 1.2 2008/04/24 19:36:14 okan Exp $
+--- gpsinfo.c.orig	Thu Apr  3 10:52:21 2008
++++ gpsinfo.c	Thu Apr 24 09:13:11 2008
+@@ -146,7 +146,8 @@ void ProcessGpsInfo(unsigned char * DirStart, int Byte
  
                      Values[a] = ConvertAnyFormat(ValuePtr+a*ComponentSize, Format);
                  }
@@ -11,7 +11,7 @@ $OpenBSD: patch-gpsinfo_c,v 1.1 2006/05/29 17:40:24 sturm Exp $
  
                  if (Tag == TAG_GPS_LAT){
                      strncpy(ImageInfo.GpsLat+2, TempString, 29);
-@@ -166,7 +167,8 @@ void ProcessGpsInfo(unsigned char * DirS
+@@ -160,7 +161,8 @@ void ProcessGpsInfo(unsigned char * DirStart, int Byte
                  break;
  
              case TAG_GPS_ALT:

graphics/jhead/patches/patch-jhead_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
---- jhead.c.orig	Tue May 23 08:50:41 2006
-+++ jhead.c	Tue May 23 08:57:01 2006
-@@ -163,7 +163,7 @@ static int FileEditComment(char * TempFi
+$OpenBSD: patch-jhead_c,v 1.5 2008/04/24 19:36:14 okan Exp $
+--- jhead.c.orig	Thu Apr  3 10:52:21 2008
++++ jhead.c	Thu Apr 24 09:15:26 2008
+@@ -153,7 +153,7 @@ static int FileEditComment(char * TempFileName, char *
  #endif
          }
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
          a = system(QuotedPath);
      }
      
-@@ -269,7 +269,8 @@ static int ModifyDescriptComment(char * 
+@@ -259,7 +259,8 @@ static int ModifyDescriptComment(char * OutComment, ch
      if (!HasScandate && !ImageInfo.DateTime[0]){
          // Scan date is not in the file yet, and it doesn't have one built in.  Add it.
          char Temp[30];
@@ -20,7 +20,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
          strcat(OutComment, Temp);
          Modified = TRUE;
      }
-@@ -295,7 +296,9 @@ static int AutoResizeCmdStuff(void)
+@@ -285,7 +286,9 @@ static int AutoResizeCmdStuff(void)
  
      if (scale < 0.5) scale = 0.5; // Don't scale down by more than a factor of two.
  
@@ -31,7 +31,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
      return TRUE;
  }
  
-@@ -325,13 +328,15 @@ static void DoCommand(const char * FileN
+@@ -315,13 +318,15 @@ static void DoCommand(const char * FileName, int ShowI
          if (ApplyCommand[a] == '&'){
              if (ApplyCommand[a+1] == 'i'){
                  // Input file.
@@ -49,7 +49,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
                  a += 1;
                  TempUsed = TRUE;
                  unlink(TempName);// Remove any pre-existing temp file
-@@ -559,7 +564,8 @@ static void DoFileRenaming(const char * 
+@@ -551,7 +556,8 @@ static void DoFileRenaming(const char * FileName)
                          memcpy(pat, pattern+ppos, 4);
                          pat[a-ppos] = 'd'; // Replace 'i' with 'd' for '%d'
                          pat[a-ppos+1] = '\0';
@@ -59,7 +59,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
                          memmove(pattern+ppos+strlen(num), pattern+a+1, strlen(pattern+a+1)+1);
                          memcpy(pattern+ppos, num, strlen(num));
                          break;
-@@ -573,8 +579,9 @@ static void DoFileRenaming(const char * 
+@@ -565,8 +571,9 @@ static void DoFileRenaming(const char * FileName)
          strftime(NewBaseName+PrefixPart, PATH_MAX, pattern, &tm);
      }else{
          // My favourite scheme.
@@ -71,7 +71,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
      }
  
      for (a=0;;a++){
-@@ -598,7 +605,7 @@ static void DoFileRenaming(const char * 
+@@ -590,7 +597,7 @@ static void DoFileRenaming(const char * FileName)
              NameExtra[0] = 0;
          }
  
@@ -80,7 +80,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
  
          if (!strcmp(FileName, NewName)) break; // Skip if its already this name.
  
-@@ -608,7 +615,8 @@ static void DoFileRenaming(const char * 
+@@ -600,7 +607,8 @@ static void DoFileRenaming(const char * FileName)
                  printf("%s --> %s\n",FileName, NewName);
  #ifdef _WIN32
                  if (RenameAssociatedFiles){
@@ -90,7 +90,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
                      RenameAssociated(FileName, NewName);
                  }
  #endif
-@@ -640,7 +648,8 @@ static int DoAutoRotate(const char * Fil
+@@ -632,7 +640,8 @@ static int DoAutoRotate(const char * FileName)
                  ErrFatal("Orientation screwup");
              }
  
@@ -100,7 +100,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
              ApplyCommand = RotateCommand;
              DoCommand(FileName, FALSE);
              ApplyCommand = NULL;
-@@ -659,7 +668,8 @@ static int DoAutoRotate(const char * Fil
+@@ -651,7 +660,8 @@ static int DoAutoRotate(const char * FileName)
                  strcpy(ThumbTempName_out, FileName);
                  strcat(ThumbTempName_out, ".tho");
                  SaveThumbnail(ThumbTempName_in);
@@ -110,7 +110,7 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
                      Argument, ThumbTempName_out, ThumbTempName_in);
  
                  if (system(RotateCommand) == 0){
-@@ -687,7 +697,8 @@ static int RegenerateThumbnail(const cha
+@@ -679,7 +689,8 @@ static int RegenerateThumbnail(const char * FileName)
          return FALSE;
      }
  
@@ -120,12 +120,12 @@ $OpenBSD: patch-jhead_c,v 1.4 2006/05/29 17:40:24 sturm Exp $
          RegenThumbnail, RegenThumbnail, FileName);
  
      if (system(ThumbnailGenCommand) == 0){
-@@ -985,7 +996,7 @@ void ProcessFile(const char * FileName)
+@@ -1012,7 +1023,7 @@ void ProcessFile(const char * FileName)
  
              // Print to temp buffer first to avoid putting null termination in destination.
-             // snprintf() would do the trick ,but not available everywhere (like FreeBSD 4.4)
+             // snprintf() would do the trick, hbut not available everywhere (like FreeBSD 4.4)
 -            sprintf(TempBuf, "%04d:%02d:%02d %02d:%02d:%02d",
 +            snprintf(TempBuf, sizeof(TempBuf), "%04d:%02d:%02d %02d:%02d:%02d",
                  tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
                  tm.tm_hour, tm.tm_min, tm.tm_sec);
- 
+