Created attachment 153408 [details] svn diff for textproc/mgdiff I use this, and have improved the current FreeBSD port installation. So I thought I'd like to Maintain it. I think there are additional improvements that can be made, maybe even make a Gtk3 counterpart. Changes worth noting: adds a color icon creates a mgdiff.desktop entry MAINTAINER WWW Changes Makefile pkg-descr pkg-plist Adds files/mgDIFF-48x48.xpm Removes files/pkg-message Please find svn diff, and QA session LOG, attached, for necessary bits to make this happen. Thanks! --Chris
Created attachment 153409 [details] QA session LOG for textproc/mgdiff
Comment on attachment 153408 [details] svn diff for textproc/mgdiff > USES= imake motif > USE_XORG= ice sm x11 xext xmu xp xt >-SUB_FILES= pkg-message > >+DESKTOP_ENTRIES= "mgdiff" "GUI front end to the UNIX diff command" \ >+ "mgDIFF-48x48" \ >+ "mgdiff" "GNOME;GTK;Motif;Development;System;" \ Why the app is listed in GNOME and GTK categories but has no such dependencies? >+WWW: http://BSDforge.com/projects/textproc/mgdiff/ WWW doesn't match MASTER_SITES. Did you take upstream maintainership as well? > post-install: >- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/mgdiff >- ${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/lib/X11/mgdiff >+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps >+ ${CP} ${FILESDIR}/mgDIFF-48x48.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/mgDIFF-48x48.xpm Why different case: mgDIFF vs. mgdiff? share/pixmaps icons aren't themed, so Icon=mgdiff-48x48 in .desktop file won't match other colorless variants. Here's a quick test for Gtk behavior via attachment 153255 [details] $ icon-lookup usage: icon-lookup icon_theme icon_name size flags $ icon-lookup test mgdiff 0 0 /usr/local/share/pixmaps/mgdiff.xpm $ icon-lookup test mgdiff 48 0 /usr/local/share/pixmaps/mgdiff.xpm $ icon-lookup test mgdiff-48x48 0 0 /usr/local/share/pixmaps/mgdiff-48x48.xpm $ icon-lookup test mgdiff-48x48 48 0 /usr/local/share/pixmaps/mgdiff-48x48.xpm >+ ${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/share/pixmaps Note, XBM format isn't supported by Icon Theme spec (v0.11). And mgdiff.xbm is already embedded in the binary. $ fgrep -r .xbm . ./Makefile.ini:MISC = Makefile Imakefile mgdiff.xbm Mgdiff.ad ./Makefile.ini:mgdiff.o : mgdiff.c mgdiff.h externs.h patchlevel.h mgdiff.xbm ./mgdiff.c:#include "mgdiff.xbm"
Comment on attachment 153408 [details] svn diff for textproc/mgdiff Also bump PORTREVISION for the following changes aren't cosmetic: - Provide .desktop file - Add 48x48 color icon - Drop pkg-message by moving icons under share/pixmaps >+ ${CP} ${FILESDIR}/mgDIFF-48x48.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/mgDIFF-48x48.xpm Use INSTALL_DATA like the line below. >+ ${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/share/pixmaps
(In reply to Jan Beich from comment #2) > Comment on attachment 153408 [details] > svn diff for textproc/mgdiff > > > USES= imake motif > > USE_XORG= ice sm x11 xext xmu xp xt > >-SUB_FILES= pkg-message > > > >+DESKTOP_ENTRIES= "mgdiff" "GUI front end to the UNIX diff command" \ > >+ "mgDIFF-48x48" \ > >+ "mgdiff" "GNOME;GTK;Motif;Development;System;" \ > > Why the app is listed in GNOME and GTK categories but has no such > dependencies? It's just a standard template I use. No harm comes from listing them. No warnings will be emitted either. > > >+WWW: http://BSDforge.com/projects/textproc/mgdiff/ > > WWW doesn't match MASTER_SITES. Did you take upstream maintainership as well? Upstream hasn't, to the best of my knowledge, *ever* provided a WWW. As a WWW wasn't provided in src, or the port, I felt others would benefit from having one. As to take upstream maintenance; I'm waiting to see if the original author expresses any objection (I've contacted him). > > > post-install: > >- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/mgdiff > >- ${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/lib/X11/mgdiff > >+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps > >+ ${CP} ${FILESDIR}/mgDIFF-48x48.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/mgDIFF-48x48.xpm > > Why different case: mgDIFF vs. mgdiff? Cause it was easier for me to [visually] differentiate it. > share/pixmaps icons aren't themed, so > Icon=mgdiff-48x48 in .desktop file won't match other colorless variants. > Here's a quick test for Gtk behavior via attachment 153255 [details] > > $ icon-lookup > usage: icon-lookup icon_theme icon_name size flags > > $ icon-lookup test mgdiff 0 0 > /usr/local/share/pixmaps/mgdiff.xpm > $ icon-lookup test mgdiff 48 0 > /usr/local/share/pixmaps/mgdiff.xpm > > $ icon-lookup test mgdiff-48x48 0 0 > /usr/local/share/pixmaps/mgdiff-48x48.xpm > $ icon-lookup test mgdiff-48x48 48 0 > /usr/local/share/pixmaps/mgdiff-48x48.xpm Thanks! > > >+ ${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/share/pixmaps > > Note, XBM format isn't supported by Icon Theme spec (v0.11). And mgdiff.xbm > is already embedded in the binary. > > $ fgrep -r .xbm . > ./Makefile.ini:MISC = Makefile Imakefile mgdiff.xbm Mgdiff.ad > ./Makefile.ini:mgdiff.o : mgdiff.c mgdiff.h externs.h patchlevel.h > mgdiff.xbm > ./mgdiff.c:#include "mgdiff.xbm" I intended to incorporate the new colored one globally. But need to add more applications to the box I'm developing on, in order to create the SVG format I intend to use. The box I develop on is slated for an update [FreeBSD] so decided to wait until then, before adding the additional applications. The one I provided, will suffice during the [short] interim. Thanks for all your attention to this, Jan Beich. --Chris
Created attachment 153436 [details] svn diff for textproc/mgdiff [UPDATED] as per Jan Beich' recommendations I think this will pretty much satisfy your comments above. PORTREVISION change case of icon && install method Next version gets consistent, && colored icons! Thanks again, for taking the time to look at this, Jan Beich. --Chris
(In reply to Chris Hutchinson from comment #5) > Created attachment 153436 [details] > svn diff for textproc/mgdiff [UPDATED] as per Jan Beich' recommendations > > I think this will pretty much satisfy your comments > above. > > PORTREVISION > change case of icon && install method > > Next version gets consistent, && colored icons! > > Thanks again, for taking the time to look at this, Jan Beich. > > --Chris forgot to tick the obsoletes... box. sorry.
Created attachment 153437 [details] svn diff for textproc/mgdiff [UPDATED] as per Jan Beich' recommendations There. That should get it.
A commit references this bug: Author: jbeich Date: Tue Feb 24 15:28:00 UTC 2015 New revision: 379808 URL: https://svnweb.freebsd.org/changeset/ports/379808 Log: - Provide .desktop file - Drop pkg-message by moving icons under share/pixmaps - Add 48x48 color icon - Add WWW link - Define LICENSE - Fix spelling of UNIX - Pass maintainership PR: 197975 Submitted by: Chris Hutchinson <portmaster@bsdforge.com> Changes: head/textproc/mgdiff/Makefile head/textproc/mgdiff/files/mgdiff-48x48.xpm head/textproc/mgdiff/files/pkg-message.in head/textproc/mgdiff/pkg-descr head/textproc/mgdiff/pkg-plist
Thanks. Committed after fixing a few typos.
(In reply to Jan Beich from comment #9) > Thanks. Committed after fixing a few typos. Thank you, Jan Beich! --Chris