From 05197de7ca80c721f8d4c6316d8d130a8405f49a Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Fri, 9 Mar 2012 21:27:33 +0000 Subject: - Fix build to install the missing lxde-logout.desktop - Bump portrevision PR: 162951 Feature safe: yes --- misc/lxde-common/Makefile | 5 +- misc/lxde-common/files/patch-Makefile-am | 12 ++++ misc/lxde-common/files/patch-Makefile-in | 108 ++++++++++++++++++++++++++++++ misc/lxde-common/files/patch-configure | 41 ++++++++++++ misc/lxde-common/files/patch-configure-ac | 18 +++++ misc/lxde-common/pkg-plist | 7 +- 6 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 misc/lxde-common/files/patch-Makefile-am create mode 100644 misc/lxde-common/files/patch-Makefile-in create mode 100644 misc/lxde-common/files/patch-configure create mode 100644 misc/lxde-common/files/patch-configure-ac (limited to 'misc/lxde-common') diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile index 399778e6e790..bf01af058017 100644 --- a/misc/lxde-common/Makefile +++ b/misc/lxde-common/Makefile @@ -7,7 +7,7 @@ PORTNAME= lxde-common PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= SF/lxde/${PORTNAME}%20%28default%20config%29/LXDE%20Common%20${PORTVERSION} @@ -22,7 +22,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GMSGFMT="${LOCALBASE}/bin/msgfmt" \ - --with-xsession-path=${PREFIX}/share/xsessions + --with-xsession-path=${PREFIX}/share/xsessions \ + --with-xdg-path=${PREFIX}/share/applications DATADIR= ${PREFIX}/share/lxde INSTALLS_ICONS= YES diff --git a/misc/lxde-common/files/patch-Makefile-am b/misc/lxde-common/files/patch-Makefile-am new file mode 100644 index 000000000000..5ef5529b4b15 --- /dev/null +++ b/misc/lxde-common/files/patch-Makefile-am @@ -0,0 +1,12 @@ +--- Makefile.am.o 2012-03-09 15:28:13.000000000 -0500 ++++ Makefile.am 2012-03-09 15:29:20.000000000 -0500 +@@ -6,6 +6,9 @@ + xsessiondir=$(xsesspath) + xsession_DATA = LXDE.desktop + ++xdgdir=$(xdgpath) ++xdg_DATA = lxde-logout.desktop ++ + defaultsdir=$(sysconfdir)/xdg/lxsession/LXDE + defaults_DATA = autostart desktop.conf + diff --git a/misc/lxde-common/files/patch-Makefile-in b/misc/lxde-common/files/patch-Makefile-in new file mode 100644 index 000000000000..99eda80ccbd1 --- /dev/null +++ b/misc/lxde-common/files/patch-Makefile-in @@ -0,0 +1,108 @@ +--- Makefile.in.o 2012-03-09 15:48:58.000000000 -0500 ++++ Makefile.in 2012-03-09 15:51:53.000000000 -0500 +@@ -79,7 +79,7 @@ + "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(lxpaneldir)" \ + "$(DESTDIR)$(lxpanel_paneldir)" "$(DESTDIR)$(openboxdir)" \ + "$(DESTDIR)$(pcmanfmdir)" "$(DESTDIR)$(wallpapersdir)" \ +- "$(DESTDIR)$(xsessiondir)" ++ "$(DESTDIR)$(xsessiondir)" "$(DESTDIR)$(xdgdir)" + SCRIPTS = $(bin_SCRIPTS) + SOURCES = + DIST_SOURCES = +@@ -92,7 +92,7 @@ + ps-recursive uninstall-recursive + DATA = $(defaults_DATA) $(images_DATA) $(lxpanel_DATA) \ + $(lxpanel_panel_DATA) $(openbox_DATA) $(pcmanfm_DATA) \ +- $(wallpapers_DATA) $(xsession_DATA) ++ $(wallpapers_DATA) $(xsession_DATA) $(xdg_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +@@ -214,12 +214,15 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + xsesspath = @xsesspath@ ++xdgpath = @xdgpath@ + SUBDIRS = man + bin_SCRIPTS = startlxde lxde-logout openbox-lxde + + # Currently these paths are hardcoded. + xsessiondir = $(xsesspath) + xsession_DATA = LXDE.desktop ++xdgdir = $(xdgpath) ++xdg_DATA = lxde-logout.desktop + defaultsdir = $(sysconfdir)/xdg/lxsession/LXDE + defaults_DATA = autostart desktop.conf + wallpapersdir = $(datadir)/lxde/wallpapers +@@ -508,6 +511,26 @@ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(xsessiondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(xsessiondir)" && rm -f $$files ++install-xdgDATA: $(xdg_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(xdgdir)" || $(MKDIR_P) "$(DESTDIR)$(xdgdir)" ++ @list='$(xdg_DATA)'; test -n "$(xdgdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xdgdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(xdgdir)" || exit $$?; \ ++ done ++ ++uninstall-xdgDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(xdg_DATA)'; test -n "$(xdgdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(xdgdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(xdgdir)" && rm -f $$files + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -824,7 +847,7 @@ + all-am: Makefile $(SCRIPTS) $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(defaultsdir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(lxpaneldir)" "$(DESTDIR)$(lxpanel_paneldir)" "$(DESTDIR)$(openboxdir)" "$(DESTDIR)$(pcmanfmdir)" "$(DESTDIR)$(wallpapersdir)" "$(DESTDIR)$(xsessiondir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(defaultsdir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(lxpaneldir)" "$(DESTDIR)$(lxpanel_paneldir)" "$(DESTDIR)$(openboxdir)" "$(DESTDIR)$(pcmanfmdir)" "$(DESTDIR)$(wallpapersdir)" "$(DESTDIR)$(xsessiondir)" "$(DESTDIR)$(xdgdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive +@@ -877,7 +900,7 @@ + install-data-am: install-defaultsDATA install-imagesDATA \ + install-lxpanelDATA install-lxpanel_panelDATA \ + install-openboxDATA install-pcmanfmDATA install-wallpapersDATA \ +- install-xsessionDATA ++ install-xsessionDATA install-xdgDATA + + install-dvi: install-dvi-recursive + +@@ -927,7 +950,7 @@ + uninstall-imagesDATA uninstall-lxpanelDATA \ + uninstall-lxpanel_panelDATA uninstall-openboxDATA \ + uninstall-pcmanfmDATA uninstall-wallpapersDATA \ +- uninstall-xsessionDATA ++ uninstall-xsessionDATA uninstall-xdgDATA + + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive +@@ -945,7 +968,7 @@ + install-info-am install-lxpanelDATA install-lxpanel_panelDATA \ + install-man install-openboxDATA install-pcmanfmDATA \ + install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip install-wallpapersDATA install-xsessionDATA \ ++ install-strip install-wallpapersDATA install-xsessionDATA install-xdgDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ +@@ -953,7 +976,7 @@ + uninstall-defaultsDATA uninstall-imagesDATA \ + uninstall-lxpanelDATA uninstall-lxpanel_panelDATA \ + uninstall-openboxDATA uninstall-pcmanfmDATA \ +- uninstall-wallpapersDATA uninstall-xsessionDATA ++ uninstall-wallpapersDATA uninstall-xsessionDATA uninstall-xdgDATA + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/misc/lxde-common/files/patch-configure b/misc/lxde-common/files/patch-configure new file mode 100644 index 000000000000..3c939aed7bb1 --- /dev/null +++ b/misc/lxde-common/files/patch-configure @@ -0,0 +1,41 @@ +--- configure.orig 2011-07-29 10:12:19.000000000 -0400 ++++ configure 2012-03-09 16:08:37.000000000 -0500 +@@ -568,6 +568,7 @@ + XMLCATALOG + XML_CATALOG_FILE + XSLTPROC ++xdgpath + xsesspath + LN_S + am__untar +@@ -636,6 +637,7 @@ + enable_option_checking + enable_man + with_xsession_path ++with_xdg_path + with_xml_catalog + ' + ac_precious_vars='build_alias +@@ -1265,6 +1267,9 @@ + --with-xsession-path=PATH + set the install path of xsession data + [[DATAROOTDIR/xsessions]] ++ --with-xdg-path=PATH ++ set the install path of xdg data ++ [[DATAROOTDIR/applications]] + --with-xml-catalog=CATALOG + path to xml catalog to use + +@@ -2235,6 +2240,12 @@ + xsesspath="\${datarootdir}/xsessions" + fi + ++# Check whether --with-xdg-path was given. ++if test "${with_xdg_path+set}" = set; then : ++ withval=$with_xdg_path; test x$withval != x && xdgpath="$withval" ++else ++ xdgpath="\${datarootdir}/applications" ++fi + + + diff --git a/misc/lxde-common/files/patch-configure-ac b/misc/lxde-common/files/patch-configure-ac new file mode 100644 index 000000000000..f5a5248553a5 --- /dev/null +++ b/misc/lxde-common/files/patch-configure-ac @@ -0,0 +1,18 @@ +--- configure.ac.orig 2011-07-29 10:04:03.000000000 -0400 ++++ configure.ac 2012-03-09 16:09:36.000000000 -0500 +@@ -23,6 +23,15 @@ + [xsesspath="\${datarootdir}/xsessions"]) + AC_SUBST(xsesspath) + ++# xdg data of path ++AC_ARG_WITH([xdg-path], ++ AS_HELP_STRING( ++ [--with-xdg-path=PATH], ++ [set the install path of xdg data [[DATAROOTDIR/applications]]]), ++ [test x$withval != x && xdgpath="$withval"], ++ [xdgpath="\${datarootdir}/applications"]) ++AC_SUBST(xdgpath) ++ + + if test x"$enable_man" = x"yes"; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) diff --git a/misc/lxde-common/pkg-plist b/misc/lxde-common/pkg-plist index 3f6fb295a897..710333828dc7 100644 --- a/misc/lxde-common/pkg-plist +++ b/misc/lxde-common/pkg-plist @@ -4,6 +4,7 @@ bin/startlxde etc/xdg/pcmanfm/LXDE/pcmanfm.conf etc/xdg/lxsession/LXDE/autostart etc/xdg/lxsession/LXDE/desktop.conf +share/applications/lxde-logout.desktop share/lxde/images/logout-banner.png share/lxde/images/lxde-icon.png share/lxde/openbox/menu.xml @@ -16,14 +17,14 @@ share/lxpanel/profile/LXDE/panels/panel share/xsessions/LXDE.desktop @dirrm etc/xdg/lxsession/LXDE @dirrm etc/xdg/lxsession -@dirrm etc/xdg/pcmanfm/LXDE -@dirrm etc/xdg/pcmanfm +@dirrmtry etc/xdg/pcmanfm/LXDE +@dirrmtry etc/xdg/pcmanfm +@dirrmtry share/applications @dirrmtry share/lxpanel/profile/LXDE/panels @dirrmtry share/lxpanel/profile/LXDE @dirrmtry share/lxpanel/profile @dirrmtry share/lxpanel @dirrm share/lxde/wallpapers -@dirrm share/lxde/pcmanfm @dirrm share/lxde/openbox @dirrm share/lxde/images @dirrm share/lxde -- cgit v1.2.3