Hi, It seems the development of jhead now happens on github, adapt it accordingly to a new release and while here also change HOMEPAGE to https.
Comments? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/jhead/Makefile,v retrieving revision 1.26 diff -u -p -u -r1.26 Makefile --- Makefile 26 Feb 2021 18:20:35 -0000 1.26 +++ Makefile 1 Nov 2021 13:00:09 -0000 @@ -2,11 +2,13 @@ COMMENT = Exif jpeg camera setting parser and thumbnail remover -DISTNAME = jhead-3.04 +GH_ACCOUNT = Matthias-Wandel +GH_PROJECT = jhead +GH_TAGNAME = 3.06.0.1 + CATEGORIES = graphics -HOMEPAGE = http://www.sentex.net/~mwandel/jhead/ -MASTER_SITES = ${HOMEPAGE} +HOMEPAGE = https://www.sentex.net/~mwandel/jhead/ MAINTAINER= Benoit Lecocq <ben...@openbsd.org> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/jhead/distinfo,v retrieving revision 1.17 diff -u -p -u -r1.17 distinfo --- distinfo 15 Dec 2019 17:00:12 -0000 1.17 +++ distinfo 1 Nov 2021 13:00:09 -0000 @@ -1,2 +1,2 @@ -SHA256 (jhead-3.04.tar.gz) = 74m7z09sJe2ICIzyQqR6au3/9PCMx9wgW/PiwPEKA8k= -SIZE (jhead-3.04.tar.gz) = 67754 +SHA256 (jhead-3.06.0.1.tar.gz) = XFJYw9eoQL+DHiIXTkokyx3juvRC98tz1asxtK4LAFg= +SIZE (jhead-3.06.0.1.tar.gz) = 1144608 Index: patches/patch-gpsinfo_c =================================================================== RCS file: /cvs/ports/graphics/jhead/patches/patch-gpsinfo_c,v retrieving revision 1.7 diff -u -p -u -r1.7 patch-gpsinfo_c --- patches/patch-gpsinfo_c 26 Feb 2021 18:20:35 -0000 1.7 +++ patches/patch-gpsinfo_c 1 Nov 2021 13:00:09 -0000 @@ -1,16 +1,8 @@ $OpenBSD: patch-gpsinfo_c,v 1.7 2021/02/26 18:20:35 naddy Exp $ ---- gpsinfo.c.orig Sun Dec 15 17:46:17 2019 -+++ gpsinfo.c Sun Dec 15 17:48:33 2019 -@@ -146,7 +146,7 @@ - FmtString[3+a*7] = (char)('0'+digits); - - Values[a] = ConvertAnyFormat(ValuePtr+a*ComponentSize, Format); -- } -+ } - - snprintf(TempString, sizeof(TempString), FmtString, Values[0], Values[1], Values[2]); - -@@ -162,8 +162,8 @@ +Index: gpsinfo.c +--- gpsinfo.c.orig ++++ gpsinfo.c +@@ -168,8 +168,8 @@ void ProcessGpsInfo(unsigned char * DirStart, unsigned break; case TAG_GPS_ALT: Index: patches/patch-jhead_c =================================================================== RCS file: /cvs/ports/graphics/jhead/patches/patch-jhead_c,v retrieving revision 1.14 diff -u -p -u -r1.14 patch-jhead_c --- patches/patch-jhead_c 15 Dec 2019 17:00:12 -0000 1.14 +++ patches/patch-jhead_c 1 Nov 2021 13:00:09 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/15 17:00:12 benoit Exp $ ---- jhead.c.orig Fri Nov 22 15:27:34 2019 -+++ jhead.c Sun Dec 15 17:39:14 2019 -@@ -165,7 +165,8 @@ +Index: jhead.c +--- jhead.c.orig ++++ jhead.c +@@ -166,7 +166,8 @@ static int FileEditComment(char * TempFileName, char * } if (strlen(Editor) > PATH_MAX) ErrFatal("env too long"); @@ -11,7 +12,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 a = system(QuotedPath); } -@@ -272,7 +273,8 @@ +@@ -273,7 +274,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[40]; @@ -21,7 +22,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 strncat(OutComment, Temp, MAX_COMMENT_SIZE-5-strlen(OutComment)); Modified = TRUE; } -@@ -304,8 +306,10 @@ +@@ -305,8 +307,10 @@ static int AutoResizeCmdStuff(void) if (scale < 0.4) scale = 0.4; // Don't scale down by too much. @@ -34,7 +35,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 return TRUE; } -@@ -632,7 +636,8 @@ +@@ -641,7 +645,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'; @@ -44,7 +45,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 nl = strlen(num); l = strlen(pattern+a+1); if (ppos+nl+l+1 >= PATH_MAX) ErrFatal("str overflow"); -@@ -648,7 +653,7 @@ +@@ -657,7 +662,7 @@ static void DoFileRenaming(const char * FileName) strftime(NewName, PATH_MAX, pattern, &tm); }else{ // My favourite scheme. @@ -53,7 +54,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); } -@@ -692,7 +697,8 @@ +@@ -701,7 +706,8 @@ static void DoFileRenaming(const char * FileName) printf("%s --> %s\n",FileName, NewName); #ifdef _WIN32 if (RenameAssociatedFiles){ @@ -63,7 +64,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 RenameAssociated(FileName, NewName); } #endif -@@ -726,7 +732,8 @@ +@@ -735,7 +741,8 @@ static int DoAutoRotate(const char * FileName) // Unknown orientation, but still modified. return TRUE; // Image is still modified. } @@ -73,7 +74,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 ApplyCommand = RotateCommand; DoCommand(FileName, FALSE); ApplyCommand = NULL; -@@ -745,7 +752,8 @@ +@@ -754,7 +761,8 @@ static int DoAutoRotate(const char * FileName) strcpy(ThumbTempName_out, FileName); strcat(ThumbTempName_out, ".tho"); SaveThumbnail(ThumbTempName_in); @@ -83,7 +84,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 Argument, ThumbTempName_out, ThumbTempName_in); if (system(RotateCommand) == 0){ -@@ -773,7 +781,8 @@ +@@ -782,7 +790,8 @@ static int RegenerateThumbnail(const char * FileName) return FALSE; } @@ -93,7 +94,7 @@ $OpenBSD: patch-jhead_c,v 1.14 2019/12/1 RegenThumbnail, RegenThumbnail, FileName); if (system(ThumbnailGenCommand) == 0){ -@@ -1143,7 +1152,7 @@ +@@ -1152,7 +1161,7 @@ static void ProcessFile(const char * FileName) // Print to temp buffer first to avoid putting null termination in destination. // snprintf() would do the trick, hbut not available everywhere (like FreeBSD 4.4) Index: patches/patch-makefile =================================================================== RCS file: /cvs/ports/graphics/jhead/patches/patch-makefile,v retrieving revision 1.5 diff -u -p -u -r1.5 patch-makefile --- patches/patch-makefile 15 Dec 2019 17:00:12 -0000 1.5 +++ patches/patch-makefile 1 Nov 2021 13:00:09 -0000 @@ -1,16 +1,24 @@ $OpenBSD: patch-makefile,v 1.5 2019/12/15 17:00:12 benoit Exp $ ---- makefile.orig Sun Dec 15 17:42:24 2019 -+++ makefile Sun Dec 15 17:44:29 2019 -@@ -3,9 +3,9 @@ +Index: makefile +--- makefile.orig ++++ makefile +@@ -1,15 +1,12 @@ #-------------------------------- - OBJ=. + # jhead makefile for Unix + #-------------------------------- +-OBJ=obj ++OBJ=. SRC=. --CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -+CPPFLAGS:=$(CPPFLAGS) +CFLAGS:=$(CFLAGS) -Wall +LDFLAGS:=$(LDFLAGS) - all: jhead +-all: objdir jhead +- +-objdir: +- @mkdir -p obj ++all: jhead + objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \ + $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o
