On 2011/01/19 09:41, Marco Peereboom wrote:
> Since I don't know how to fix this, can someone send me a correct diff?
see below, I think this one is better.
I cleaned up whitespace a bit too, sorted WANTLIB, and added a patch
to fix a typo in xxxterm.desktop (which makes the patch slightly annoying
to apply to a tree which you might commit from; cd /usr/ports/www/xterm;
cvs up -dA (** NO -P **); then you can patch with -E -p0).
> > > you can also just use
> > > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > instead of doing install+subst
> >
> > But then you have to do chown anyway, since SUBST_CMD does not support
> > "-m mode" switch.
if the desktop file had been in the ports tree instead (e.g. in
www/xterm/files) then we could not rely on the mode as the tree
might have been checked out with umask 002. but it's ok here,
because the file is in the tarball with the correct permissions
(pkg_subst just copies the existing permissions - I wouldn't
oppose -m support for pkg_subst, I think it was discussed before
but I don't recall the outcome).
I'm ok with this update and diff, but at this point I would like
to see an ok from another ports hacker who has been through a
couple of release cycles as obviously we are going to be short
on time to fix any problems.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/xxxterm/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 9 Jan 2011 21:28:37 -0000 1.12
+++ Makefile 19 Jan 2011 16:52:36 -0000
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2011/01/09 21:28:37 marco Exp $
COMMENT = vi-like minimalists web browser
-
-DISTNAME = xxxterm-1.226
-
+DISTNAME = xxxterm-1.275
CATEGORIES = www
HOMEPAGE = http://opensource.conformal.com/wiki/XXXTerm
@@ -16,30 +14,27 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-MODULES = devel/gettext
+MODULES += devel/gettext
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gnutls gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
-WANTLIB += pthread pthread-stubs soup-2.4 util xcb xcb-render
-WANTLIB += GL Xxf86vm drm xcb-shm xml2 z
-WANTLIB += webkit-1.0
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm expat
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gnutls gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pixman-1 png pthread pthread-stubs soup-2.4 util webkit-1.0
+WANTLIB += xcb xcb-render xcb-shm xml2 z
-LIB_DEPENDS = www/webkit
+MASTER_SITES = http://opensource.conformal.com/snapshots/xxxterm/
+LIB_DEPENDS = www/webkit
RUN_DEPENDS = devel/desktop-file-utils
-MASTER_SITES = http://opensource.conformal.com/snapshots/xxxterm/
-
EXTRACT_SUFX = .tgz
-
-
-NO_REGRESS= Yes
+NO_REGRESS = Yes
EXAMPLEDIR = ${PREFIX}/share/examples/xxxterm
+SUBST_VARS += TRUEPREFIX
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xxxterm ${PREFIX}/bin
@@ -50,8 +45,8 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/xxxterm/
${INSTALL_DATA} ${WRKSRC}/xxxtermicon*.png ${PREFIX}/share/xxxterm/
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
- @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
${PREFIX}/share/applications/xxxterm.desktop
- ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
- ${CHOWN} ${SHAREOWN}:${SHAREGRP}
$(PREFIX)/share/applications/xxxterm.desktop
+ ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
+ -c ${WRKSRC}/xxxterm.desktop \
+ ${PREFIX}/share/applications/xxxterm.desktop
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/xxxterm/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 9 Jan 2011 21:28:37 -0000 1.8
+++ distinfo 19 Jan 2011 16:52:36 -0000
@@ -1,5 +1,5 @@
-MD5 (xxxterm-1.226.tgz) = rGSq8lv/qqHUy/MKhgiX7w==
-RMD160 (xxxterm-1.226.tgz) = Zztf0SpiaxshUyeRoG+OtjO7goU=
-SHA1 (xxxterm-1.226.tgz) = uQcTZk1gmFEQwOMKxPFSFmNh1rY=
-SHA256 (xxxterm-1.226.tgz) = 94AI2MFunhjDk/lBW+3de8GkkcYh+Y5L+soab2jge7A=
-SIZE (xxxterm-1.226.tgz) = 124171
+MD5 (xxxterm-1.275.tgz) = fE223846IS1FhLDu6b2R7g==
+RMD160 (xxxterm-1.275.tgz) = 5nLeg5hUw6wF7dyfQPE7H1Nn9D4=
+SHA1 (xxxterm-1.275.tgz) = jTh8LGz4bxzAg9uMbvYPy0H6UKE=
+SHA256 (xxxterm-1.275.tgz) = bbstgj2N2x7xaO1IVQB9YNvZuPSIhNYulzD2AToPWXI=
+SIZE (xxxterm-1.275.tgz) = 130301
Index: patches/patch-xxxterm_desktop
===================================================================
RCS file: patches/patch-xxxterm_desktop
diff -N patches/patch-xxxterm_desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-xxxterm_desktop 19 Jan 2011 16:52:36 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- xxxterm.desktop.orig Wed Jan 19 16:39:14 2011
++++ xxxterm.desktop Wed Jan 19 16:39:19 2011
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=xxxterm Browswer
++Name=xxxterm Browser
+ Comment=Minimalist's Web Browser
+ Terminal=false
+ Type=Application
