flnews-devel: Update to 0.18pre2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: flnews-devel: Update to 0.18pre2
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Fri, 17 Jan 2020 10:27:51 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Jan 17 11:27:51 2020 +0100
Changeset:	5148d22e481673c1477a3775427a29f01eb9ba8e

Modified Files:
	flnews-devel/Makefile
	flnews-devel/PLIST
	flnews-devel/distinfo
	flnews-devel/files/CONFIG
	flnews-devel/options.mk
Removed Files:
	flnews-devel/files/48x48/flnews.png
	flnews-devel/files/64x64/flnews.png
	flnews-devel/files/flnews.desktop

Log Message:
flnews-devel: Update to 0.18pre2

XDG files installation now depends on xdg-utils option.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5148d22e481673c1477a3775427a29f01eb9ba8e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 flnews-devel/Makefile               |  43 +++++++++---------------------------
 flnews-devel/PLIST                  |   6 ++---
 flnews-devel/distinfo               |   8 +++----
 flnews-devel/files/48x48/flnews.png | Bin 1819 -> 0 bytes
 flnews-devel/files/64x64/flnews.png | Bin 476 -> 0 bytes
 flnews-devel/files/CONFIG           |   6 ++++-
 flnews-devel/files/flnews.desktop   |  15 -------------
 flnews-devel/options.mk             |  27 +++++++++++++++++-----
 8 files changed, 43 insertions(+), 62 deletions(-)

diffs:
diff --git a/flnews-devel/Makefile b/flnews-devel/Makefile
index cdea804248..e01823298d 100644
--- a/flnews-devel/Makefile
+++ b/flnews-devel/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD$
 
-FLNEWS_VERSION=	0.18pre1
+FLNEWS_VERSION=	0.18pre2
 
 DISTNAME=	flnews-${FLNEWS_VERSION}
-PKGREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	http://micha.freeshell.org/flnews/src/
 MASTER_SITES+=	http://www.ybtra.de/flnews-mirror/src/
@@ -25,9 +24,6 @@ FLNEWS_MAINTAINER=	${MAINTAINER}
 
 .include "options.mk"
 
-post-extract:
-	${CP} ${FILESDIR}/CONFIG ${WRKSRC}
-
 # Prepare CONFIG file
 SUBST_CLASSES+=			edit-config
 SUBST_STAGE.edit-config=	pre-configure
@@ -40,7 +36,12 @@ SUBST_SED.edit-config+=		-e 's,@IP6@,${FLNEWS_OPT_DISABLE_IP6},g'
 SUBST_SED.edit-config+=		-e 's,@NLS@,${FLNEWS_OPT_DISABLE_NLS},g'
 SUBST_SED.edit-config+=		-e 's,@XDBE@,${FLNEWS_OPT_DISABLE_XDBE},g'
 SUBST_SED.edit-config+=		-e 's,@MAN_PATH@,${PREFIX}/${PKGMANDIR},g'
-# NetBSD reports X/Open XSI extension as not available using the POSIX
+.if ${FLNEWS_OPT_DISABLE_XDG} == 0
+SUBST_SED.edit-config+=		-e 's,@XDG@,0,g'
+.else
+SUBST_SED.edit-config+=		-e 's,@XDG@,1,g'
+.endif
+# NetBSD 7 reports X/Open XSI extension as not available using the POSIX
 # sysconf(_SC_XOPEN_VERSION) call, but has a sufficient implementation
 # => Force using it
 .if ${OPSYS} == "NetBSD"
@@ -48,7 +49,7 @@ SUBST_SED.edit-config+=		-e 's,@FORCE_XSI@,1,g'
 .else
 SUBST_SED.edit-config+=		-e 's,@FORCE_XSI@,0,g'
 .endif
-# NetBSD reports IPv6 as not available using the POSIX sysconf(_SC_IPV6)
+# NetBSD 7 reports IPv6 as not available using the POSIX sysconf(_SC_IPV6)
 # call, but has a sufficient implementation
 # => Force using it if inet6 option of pkgsrc package is selected
 .if ${OPSYS} == "NetBSD" && ${FLNEWS_OPT_DISABLE_IP6} == 0
@@ -66,49 +67,25 @@ SUBST_SED.edit-config+=		-e 's,@DEP_MD@,\#,g'
 SUBST_SED.edit-config+=		-e 's,@DEP_COMP@,,g'
 .endif
 
-INSTALLATION_DIRS+=		share/applications
-INSTALLATION_DIRS+=		share/icons/hicolor/48x48/apps
-INSTALLATION_DIRS+=		share/icons/hicolor/64x64/apps
-
-pre-configure:
-	${MKDIR} ${WRKDIR}/desktop
-	${CP} ${FILESDIR}/flnews.desktop ${WRKDIR}/desktop
-	${MKDIR} ${WRKDIR}/desktop/48x48
-	${CP} ${FILESDIR}/48x48/flnews.png ${WRKDIR}/desktop/48x48
-	${MKDIR} ${WRKDIR}/desktop/64x64
-	${CP} ${FILESDIR}/64x64/flnews.png ${WRKDIR}/desktop/64x64
+post-extract:
+	${CP} ${FILESDIR}/CONFIG ${WRKSRC}
 
 do-configure:
 	cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
 
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/desktop/flnews.desktop \
-		${DESTDIR}${PREFIX}/share/applications/flnews.desktop
-	${INSTALL_DATA} ${WRKDIR}/desktop/48x48/flnews.png \
-		${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/flnews.png
-	${INSTALL_DATA} ${WRKDIR}/desktop/64x64/flnews.png \
-		${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/flnews.png
-
 .if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
 BUILD_DEPENDS+=			makedepend-[0-9]*:../../devel/makedepend
 .endif
 
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 # OpenSSL 1.1 API is required for signature algorithm negotiation
 # OpenSSL 1.1 API is required for TLSv1.2 FFDHE group check
 # At least OpenSSL 1.1.1 is required for TLSv1.3
 # OpenSSL 3 API is required for FFDHE group negotiation
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.0
 .include "../../security/openssl/buildlink3.mk"
-# Quoted from comment:
-# | This Makefile fragment is intended to be included by packages that install
-# | desktop entries.
-# There is a desktop entry, but no MIME types are associated with this program.
-# Is this nevertheless required?
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 # FLTK must be compiled with multithreading support
 # FLTK version 1.4 is supported (should be compiled with pango support)
 #.include "../../x11/fltk13/buildlink3.mk"
diff --git a/flnews-devel/PLIST b/flnews-devel/PLIST
index a893926913..9b7bbceacb 100644
--- a/flnews-devel/PLIST
+++ b/flnews-devel/PLIST
@@ -2,7 +2,7 @@
 bin/flnews
 ${PLIST.nls}lib/flnews/nls/de_DE.cat
 man/man1/flnews.1
-share/applications/flnews.desktop
+${PLIST.xdg}share/applications/flnews.desktop
 share/flnews/license.txt
-share/icons/hicolor/48x48/apps/flnews.png
-share/icons/hicolor/64x64/apps/flnews.png
+${PLIST.xdg}share/icons/hicolor/48x48/apps/flnews.png
+${PLIST.xdg}share/icons/hicolor/64x64/apps/flnews.png
diff --git a/flnews-devel/distinfo b/flnews-devel/distinfo
index 51b2edaea6..990fb21440 100644
--- a/flnews-devel/distinfo
+++ b/flnews-devel/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (flnews-0.18pre1.tar.bz2) = 688c40f93512fabe11c65a4e9bd177a9f14c85f1
-RMD160 (flnews-0.18pre1.tar.bz2) = 741e722f0de86adda7fe73fd9081872106be8569
-SHA512 (flnews-0.18pre1.tar.bz2) = fa8bf803ecb4a8854fc8001ae50828aef6dbb6b018840debba157dcc3a2021e239b7b41ce890549977daa5f751e17d13d87e8b4878c483aff901c3441353d7be
-Size (flnews-0.18pre1.tar.bz2) = 1074757 bytes
+SHA1 (flnews-0.18pre2.tar.bz2) = fba3bd8f04ad30fe46b5d72973232ee702677bf3
+RMD160 (flnews-0.18pre2.tar.bz2) = 5990df1e030d9f5809d8af14b5dcb25ed846110c
+SHA512 (flnews-0.18pre2.tar.bz2) = 85f546627b297815371f4aff39da41867489038d016bce3d94be9b3a72547ea8670621e5a8bb33b4ee27e767781308c93b4460cfe66216fcfe7489e4a6b5e376
+Size (flnews-0.18pre2.tar.bz2) = 1080023 bytes
diff --git a/flnews-devel/files/48x48/flnews.png b/flnews-devel/files/48x48/flnews.png
deleted file mode 100644
index 2be27158bc..0000000000
Binary files a/flnews-devel/files/48x48/flnews.png and /dev/null differ
diff --git a/flnews-devel/files/64x64/flnews.png b/flnews-devel/files/64x64/flnews.png
deleted file mode 100644
index 493fc3e188..0000000000
Binary files a/flnews-devel/files/64x64/flnews.png and /dev/null differ
diff --git a/flnews-devel/files/CONFIG b/flnews-devel/files/CONFIG
index 4358c73761..0054bb1be1 100644
--- a/flnews-devel/files/CONFIG
+++ b/flnews-devel/files/CONFIG
@@ -33,7 +33,7 @@ CFG_CMPR_DISABLE=0
 CFG_DB_DISABLE=@XDBE@
 
 # Disable National Language Support (NLS)
-# Set this to 1 to disable NLS even if system report it as available.
+# Set this to 1 to disable NLS even if system report it as available
 CFG_NLS_DISABLE=@NLS@
 
 # The TLS module can do some simple checks and generate warnings if it thinks
@@ -48,6 +48,10 @@ CFG_TLS_WARNING_DISABLE=1
 # Note: Not all CAs provide CRL distribution points in their certificates
 # Set this to 0 to check the whole chain for revoked certificates
 CFG_TLS_CRLS_DISABLE=0
+
+# Disable XDG support
+# Set this to 0 to install XDG conformant desktop entries and icon themes
+CFG_XDG_DISABLE=@XDG@
 # ==============================================================================
 
 
diff --git a/flnews-devel/files/flnews.desktop b/flnews-devel/files/flnews.desktop
deleted file mode 100644
index b89dce3a62..0000000000
--- a/flnews-devel/files/flnews.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-# Conformant to desktop-entry-spec-1.1 (spec says 1.0 what is likely an error)
-Version=1.1
-Type=Application
-Name=flnews
-GenericName=Newsreader
-Comment=A fast and lightweight USENET newsreader
-Exec=flnews
-Terminal=false
-DBusActivatable=false
-Keywords=Network;
-# Conformant to menu-spec-1.0.html
-Categories=Network;
-# Conformant to icon-theme-spec-0.11
-Icon=flnews
diff --git a/flnews-devel/options.mk b/flnews-devel/options.mk
index 43af90a143..1ba8cfd9c5 100644
--- a/flnews-devel/options.mk
+++ b/flnews-devel/options.mk
@@ -21,12 +21,12 @@ FLNEWS_OPT_DISABLE_IP6=		1
 # nls: Optional support for National Language Support (NLS)
 # Requires an OS with X/Open XSI extension API (SUSv2) and the gencat utility
 # Note: Only locales with UTF-8, ISO-8859-1 or US-ASCII codeset are supported!
-PLIST_VARS+=		nls
+PLIST_VARS+=			nls
 .if !empty(PKG_OPTIONS:Mnls)
-PLIST.nls=		yes
-FLNEWS_OPT_DISABLE_NLS=	0
+PLIST.nls=			yes
+FLNEWS_OPT_DISABLE_NLS=		0
 .else
-FLNEWS_OPT_DISABLE_NLS=	1
+FLNEWS_OPT_DISABLE_NLS=		1
 .endif
 
 # xdbe: Optional support for X11 Double Buffer Extension (XDBE)
@@ -37,8 +37,23 @@ FLNEWS_OPT_DISABLE_XDBE=	0
 FLNEWS_OPT_DISABLE_XDBE=	1
 .endif
 
-# xdg-utils: Create dependency for xdg-utils (Portland project)
-# xdg-utils are used for WWW-Browser and eMail redirection
+# xdg: Optional support for XDG (Cross-Desktop Group, now freedesktop.org)
+# - Install desktop file
+# - Install icon-theme
+# - xdg-utils (Portland project) dependency
+#   Used for WWW browser and e-mail redirection
+PLIST_VARS+=			xdg
 .if !empty(PKG_OPTIONS:Mxdg-utils)
+PLIST.xdg=			yes
+FLNEWS_OPT_DISABLE_XDG=		0
 DEPENDS+=	xdg-utils>=1.1:../../misc/xdg-utils
+.  include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+# Quoted from comment:
+# | This Makefile fragment is intended to be included by packages that install
+# | desktop entries.
+# There is a desktop entry, but no MIME types are associated with this program.
+# Is this nevertheless required?
+.  include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.else
+FLNEWS_OPT_DISABLE_XDG=		1
 .endif
Prev by Date: lxqt-panel-0.14.1, self-reviewed
Next by Date: lxqt-0.14.1, self-reviewed
Previous by Thread: lxqt-panel-0.14.1, self-reviewed
Next by Thread: lxqt-0.14.1, self-reviewed
Indexes:
Home | Main Index | Thread Index | Old Index