On Mon, Apr 06, 2015 at 02:33:16PM +0200, Dmitrij D. Czarkoff wrote:
> Antoine Jacoutot said:
> > On Mon, Apr 06, 2015 at 12:08:41PM +0200, Dmitrij D. Czarkoff wrote:
> >> Dmitrij D. Czarkoff said:
> >>> Below is an update for games/xlennart (1.1 => 1.1.1) which basically
> >>> fixes issues with Makefile and adds .desktop file.
> >>>
> >>> While at it, fixed the license marker.
> >>>
> >>> Comments? OKs?
> >>
> >> As was pointed out by ajacoutot@, gnome module isn't really needed for
> >> this port.
> >
> > You still need to depend on desktop-file-utils and add the proper goos.
>
> Like this?
Correct, but regen the PLIST, 'share/applications/' should go.
With that, OK for me.
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/games/xlennart/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 10 Dec 2014 17:53:29 -0000 1.2
> +++ Makefile 6 Apr 2015 12:31:28 -0000
> @@ -3,18 +3,20 @@
> COMMENT = an XBill Modification
> GH_ACCOUNT = Xylemon
> GH_PROJECT = xlennart
> -GH_TAGNAME = 1.1
> +GH_TAGNAME = 1.1.1
> DISTNAME = xlennart-${GH_TAGNAME}
> CATEGORIES = games x11
> HOMEPAGE = https://github.com/Xylemon/xlennart
>
> MAINTAINER = Dmitrij D. Czarkoff <czark...@gmail.com>
>
> -# GPLv2
> +# GPLv2+
> PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB += ICE SM X11 Xaw Xmu Xpm Xt c
>
> +RUN_DEPENDS = devel/desktop-file-utils
> +
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS += ${CONFIGURE_SHARED} --disable-motif --disable-gtk \
> --enable-athena --localstatedir=/var/games/xlennart
> @@ -23,5 +25,8 @@ post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xlennart
> ${INSTALL_DATA} ${WRKSRC}/scores \
> ${PREFIX}/share/examples/xlennart/xlennart.scores
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> + ${INSTALL_DATA} ${WRKSRC}/xlennart.desktop \
> + ${PREFIX}/share/applications/
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /var/cvs/ports/games/xlennart/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 10 Dec 2014 17:53:29 -0000 1.2
> +++ distinfo 6 Apr 2015 09:00:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (xlennart-1.1.tar.gz) = Us/EuI7Dir7oZUxvQb7HCbuIEGfwmGB7LcLgWnliUWw=
> -SIZE (xlennart-1.1.tar.gz) = 177628
> +SHA256 (xlennart-1.1.1.tar.gz) = xhTbXnzA5kRpt9v2lXFw/xTpO1gOfKGIXpQEGlECvVc=
> +SIZE (xlennart-1.1.1.tar.gz) = 179953
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 10 Dec 2014 17:53:29 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,34 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.2 2014/12/10 17:53:29 landry Exp $
> ---- Makefile.in.orig Wed Dec 10 11:38:02 2014
> -+++ Makefile.in Wed Dec 10 11:41:33 2014
> -@@ -30,7 +30,7 @@ PROG = xlennart
> - OBJS = Bill.o Bucket.o Cable.o Computer.o Game.o Horde.o Network.o \
> - OS.o Scorelist.o Spark.o UI.o util.o @WIDGET_OBJS@
> -
> --XPMS = pixmaps/about.xpm pixmaps/billA_0.xpm \
> -+XPMS = pixmaps/about.xpm pixmaps/arch.xpm pixmaps/billA_0.xpm \
> - pixmaps/billA_1.xpm pixmaps/billA_10.xpm pixmaps/billA_11.xpm \
> - pixmaps/billA_12.xpm pixmaps/billA_2.xpm pixmaps/billA_3.xpm \
> - pixmaps/billA_4.xpm pixmaps/billA_5.xpm pixmaps/billA_6.xpm \
> -@@ -39,14 +39,13 @@ XPMS = pixmaps/about.xpm pixmaps/billA_0.xpm \
> - pixmaps/billD_3.xpm pixmaps/billD_4.xpm pixmaps/billL_0.xpm \
> - pixmaps/billL_1.xpm pixmaps/billL_2.xpm pixmaps/billR_0.xpm \
> - pixmaps/billR_1.xpm pixmaps/billR_2.xpm pixmaps/bsd.xpm \
> -- pixmaps/bsdcpu.xpm pixmaps/bucket.xpm pixmaps/arch.xpm \
> -- pixmaps/icon.xpm pixmaps/centos.xpm pixmaps/logo.xpm \
> -- pixmaps/maccpu.xpm pixmaps/debian.xpm pixmaps/nextcpu.xpm \
> -- pixmaps/gentoo.xpm pixmaps/openbsd.xpm pixmaps/os2cpu.xpm \
> -- pixmaps/palm.xpm pixmaps/palmcpu.xpm pixmaps/mandriva.xpm \
> -- pixmaps/spark_0.xpm pixmaps/slackware.xpm pixmaps/suse.xpm \
> -- pixmaps/spark_1.xpm pixmaps/ubuntu.xpm pixmaps/sgicpu.xpm \
> -- pixmaps/suncpu.xpm pixmaps/toaster.xpm pixmaps/initfail.xpm
> -+ pixmaps/bsdcpu.xpm pixmaps/bucket.xpm pixmaps/centos.xpm \
> -+ pixmaps/debian.xpm pixmaps/gentoo.xpm pixmaps/icon.xpm \
> -+ pixmaps/initfail.xpm pixmaps/logo.xpm pixmaps/maccpu.xpm \
> -+ pixmaps/mandriva.xpm pixmaps/nextcpu.xpm pixmaps/openbsd.xpm \
> -+ pixmaps/os2cpu.xpm pixmaps/sgicpu.xpm pixmaps/slackware.xpm \
> -+ pixmaps/spark_0.xpm pixmaps/spark_1.xpm pixmaps/suncpu.xpm \
> -+ pixmaps/suse.xpm pixmaps/toaster.xpm pixmaps/ubuntu.xpm
> -
> - XBMS = bitmaps/arch.xbm bitmaps/bsd.xbm bitmaps/bucket.xbm
> bitmaps/centos.xbm \
> - bitmaps/debian.xbm bitmaps/gentoo.xbm bitmaps/hand_down.xbm \
> Index: pkg/PLIST
> ===================================================================
> RCS file: /var/cvs/ports/games/xlennart/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 10 Dec 2014 17:53:29 -0000 1.3
> +++ pkg/PLIST 6 Apr 2015 12:31:59 -0000
> @@ -3,6 +3,8 @@
> @bin bin/xlennart
> @group
> @man man/man6/xlennart.6
> +share/applications/
> +share/applications/xlennart.desktop
> share/examples/xlennart/
> share/examples/xlennart/xlennart.scores
> @mode g+w
> @@ -77,3 +79,5 @@ share/xlennart/pixmaps/suncpu.xpm
> share/xlennart/pixmaps/suse.xpm
> share/xlennart/pixmaps/toaster.xpm
> share/xlennart/pixmaps/ubuntu.xpm
> +@exec %D/bin/update-desktop-database
>
>
> +@unexec-delete %D/bin/update-desktop-database
>
>
--
Antoine
