pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lxde-common: update to 0.99.1
Module Name: pkgsrc-wip
Committed By: youri <youri%NetBSD.org@localhost>
Pushed By: youri
Date: Tue Apr 5 15:44:18 2016 +0200
Changeset: 87006a9d8e3ef1c58e89c157e410201862a78e7b
Modified Files:
lxde-common/Makefile
lxde-common/PLIST
lxde-common/distinfo
Added Files:
lxde-common/patches/patch-configure
Removed Files:
lxde-common/TODO
lxde-common/patches/patch-aa
Log Message:
lxde-common: update to 0.99.1
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87006a9d8e3ef1c58e89c157e410201862a78e7b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lxde-common/Makefile | 33 ++++++++++++++++++++++++++++++---
lxde-common/PLIST | 18 ++++++++++--------
lxde-common/TODO | 33 ---------------------------------
lxde-common/distinfo | 8 +++++---
lxde-common/patches/patch-aa | 18 ------------------
lxde-common/patches/patch-configure | 21 +++++++++++++++++++++
6 files changed, 66 insertions(+), 65 deletions(-)
diffs:
diff --git a/lxde-common/Makefile b/lxde-common/Makefile
index c3daaed..fdc4694 100644
--- a/lxde-common/Makefile
+++ b/lxde-common/Makefile
@@ -1,15 +1,17 @@
# $NetBSD: Makefile,v 1.7 2013/02/01 01:38:00 jeremy-c-reed Exp $
-DISTNAME= lxde-common-0.5.5
-PKGREVISION= 1
+DISTNAME= lxde-common-0.99.1
CATEGORIES= devel x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lxde/}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://lxde.sourceforge.net/
COMMENT= Default configuration settings and scripts for LXDE
LICENSE= gnu-gpl-v2
+USE_TOOLS+= intltool pkg-config gmake
+
DEPENDS+= dbus>=1:../../sysutils/dbus
# Clearlooks is default GTK theme for the LXDE lxsession
DEPENDS+= gtk2-engines>=0:../../x11/gtk2-engines
@@ -18,6 +20,31 @@ DEPENDS+= lxsession>=0:../../x11/lxsession
DEPENDS+= openbox>=0:../../wm/openbox
DEPENDS+= xprop>=0:../../x11/xprop
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
+LXDE_CONF= share/examples/lxde
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${LXDE_CONF}
+PKG_SYSCONFSUBDIR= xdg
+
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/lxpanel/LXDE \
+ ${PKG_SYSCONFDIR}/lxpanel/LXDE/panels \
+ ${PKG_SYSCONFDIR}/lxsession/LXDE \
+ ${PKG_SYSCONFDIR}/openbox/LXDE \
+ ${PKG_SYSCONFDIR}/pcmanfm/LXDE
+
+CONF_FILES+= ${LXDE_CONF}/xdg/lxpanel/LXDE/config \
+ ${PKG_SYSCONFDIR}/lxpanel/LXDE/config \
+ ${LXDE_CONF}/xdg/lxpanel/LXDE/panels/panel \
+ ${PKG_SYSCONFDIR}/lxpanel/LXDE/panels/panel \
+ ${LXDE_CONF}/xdg/lxsession/LXDE/autostart \
+ ${PKG_SYSCONFDIR}/lxsession/LXDE/autostart \
+ ${LXDE_CONF}/xdg/lxsession/LXDE/desktop.conf \
+ ${PKG_SYSCONFDIR}/lxsession/LXDE/desktop.conf \
+ ${LXDE_CONF}/xdg/openbox/LXDE/menu.xml \
+ ${PKG_SYSCONFDIR}/openbox/LXDE/menu.xml \
+ ${LXDE_CONF}/xdg/openbox/LXDE/rc.xml \
+ ${PKG_SYSCONFDIR}/openbox/LXDE/rc.xml \
+ ${LXDE_CONF}/xdg/pcmanfm/LXDE/pcmanfm.conf \
+ ${PKG_SYSCONFDIR}/pcmanfm/LXDE/pcmanfm.conf
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lxde-common/PLIST b/lxde-common/PLIST
index 109285a..c76c418 100644
--- a/lxde-common/PLIST
+++ b/lxde-common/PLIST
@@ -1,20 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2012/05/17 04:20:52 jeremy-c-reed Exp $
+@comment $NetBSD$
bin/lxde-logout
bin/openbox-lxde
bin/startlxde
-etc/xdg/lxsession/LXDE/autostart
-etc/xdg/lxsession/LXDE/desktop.conf
-etc/xdg/pcmanfm/LXDE/pcmanfm.conf
man/man1/lxde-logout.1
man/man1/openbox-lxde.1
man/man1/startlxde.1
+share/applications/lxde-logout.desktop
+share/applications/lxde-screenlock.desktop
+share/examples/lxde/xdg/lxpanel/LXDE/config
+share/examples/lxde/xdg/lxpanel/LXDE/panels/panel
+share/examples/lxde/xdg/lxsession/LXDE/autostart
+share/examples/lxde/xdg/lxsession/LXDE/desktop.conf
+share/examples/lxde/xdg/openbox/LXDE/menu.xml
+share/examples/lxde/xdg/openbox/LXDE/rc.xml
+share/examples/lxde/xdg/pcmanfm/LXDE/pcmanfm.conf
share/lxde/images/logout-banner.png
share/lxde/images/lxde-icon.png
-share/lxde/openbox/menu.xml
-share/lxde/openbox/rc.xml
share/lxde/wallpapers/lxde_blue.jpg
share/lxde/wallpapers/lxde_green.jpg
share/lxde/wallpapers/lxde_red.jpg
-share/lxpanel/profile/LXDE/config
-share/lxpanel/profile/LXDE/panels/panel
share/xsessions/LXDE.desktop
diff --git a/lxde-common/TODO b/lxde-common/TODO
deleted file mode 100644
index 1c7a8c6..0000000
--- a/lxde-common/TODO
+++ /dev/null
@@ -1,33 +0,0 @@
-lubuntu patches in
-http://archive.ubuntu.com/ubuntu/pool/universe/l/lxde-common/lxde-common_0.5.0-4ubuntu3.debian.tar.gz
-
-
--=-=-=-
-
-check that these work; notice complaint:
-
-Error: sysconfdir is not /etc.
-Please consider passing --sysconfdir=/etc to configure.
-Otherwise default config files will be installed to wrong place.
-
-
--=-=-=-=
-
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=3398771&group_id=180858&atid=894869
-is patch-aa
-but need to patch Makefile.in also
-maybe just wait
-
-
-/usr/share/lxde/openbox/rc.xml
-lxsession
-openbox
-pcmanfm config
-xprop
-dbus-launch
-xscreensaver
-xterm
-firefox
-
-the lubuntu version also references scrot, amixer, xblacklight, galculator
diff --git a/lxde-common/distinfo b/lxde-common/distinfo
index 41bb2b9..daa2777 100644
--- a/lxde-common/distinfo
+++ b/lxde-common/distinfo
@@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.2 2012/05/17 04:20:52 jeremy-c-reed Exp $
-SHA1 (lxde-common-0.5.5.tar.gz) = 27ce9bcaf109ded61aa0c691a8dc6059a04a6d08
-RMD160 (lxde-common-0.5.5.tar.gz) = 8f821c0bf3ec207ff99db9d952b05b052ca87ce4
-Size (lxde-common-0.5.5.tar.gz) = 899075 bytes
+SHA1 (lxde-common-0.99.1.tar.xz) = 6dda860cc0c96a3d0d444325ac9f4ee6c3a7b946
+RMD160 (lxde-common-0.99.1.tar.xz) = f1aaf284109c54388a5201d4c7a49454cd50ccf4
+SHA512 (lxde-common-0.99.1.tar.xz) = f5a14c44d827ba2355efd10c78732157f5645392ebbeb8e2a8126340a36eeba2842eff0c5338bb36623e5fe2da894c89d60a45c0b177704e2260413d63232b05
+Size (lxde-common-0.99.1.tar.xz) = 889656 bytes
+SHA1 (patch-configure) = 52f637fa4c481defcb96fbcabfbf665593a38e97
diff --git a/lxde-common/patches/patch-aa b/lxde-common/patches/patch-aa
deleted file mode 100644
index 30bb7ee..0000000
--- a/lxde-common/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/05/17 04:20:52 jeremy-c-reed Exp $
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=3398771&group_id=180858&atid=894869
-
-Index: lxde-common-0.5.5/Makefile.am
-===================================================================
---- Makefile.am.orig
-+++ Makefile.am
-@@ -20,6 +20,9 @@ images_DATA= \
- images/logout-banner.png \
- images/lxde-icon.png
-
-+lxlogoutdir=$(datadir)/applications/
-+lxlogout_DATA=lxde-logout.desktop
-+
- lxpaneldir=$(datadir)/lxpanel/profile/LXDE
- lxpanel_DATA=lxpanel/config
-
diff --git a/lxde-common/patches/patch-configure b/lxde-common/patches/patch-configure
new file mode 100644
index 0000000..f62ce7b
--- /dev/null
+++ b/lxde-common/patches/patch-configure
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Remove error about sysconfdir.
+
+--- configure.orig 2016-02-20 23:42:52.000000000 +0000
++++ configure
+@@ -7119,14 +7119,3 @@ if test -n "$ac_unrecognized_opts" && te
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
+-if test x"$sysconfdir" != x'/etc'; then
+- echo
+- echo
+- echo 'Error: sysconfdir is not /etc.'
+- echo 'Please consider passing --sysconfdir=/etc to configure.';
+- echo 'Otherwise default config files will be installed to wrong place.'
+- echo
+- echo
+-fi
Home |
Main Index |
Thread Index |
Old Index