svn commit: r340775 - in head/x11-wm: compiz-fusion golem golem/files matwm2 matwm2/files
Vanilla I. Shu
vanilla at FreeBSD.org
Thu Jan 23 03:06:17 UTC 2014
Author: vanilla
Date: Thu Jan 23 03:06:15 2014
New Revision: 340775
URL: http://svnweb.freebsd.org/changeset/ports/340775
QAT: https://qat.redports.org/buildarchive/r340775/
Log:
Support STAGEDIR.
Approved by: portmgr (blanket infrastructure)
Added:
head/x11-wm/golem/files/patch-Makefile.rules.gnu.in (contents, props changed)
Deleted:
head/x11-wm/compiz-fusion/pkg-plist
Modified:
head/x11-wm/golem/Makefile
head/x11-wm/golem/pkg-plist
head/x11-wm/matwm2/Makefile
head/x11-wm/matwm2/files/patch-Makefile.in
Modified: head/x11-wm/golem/Makefile
==============================================================================
--- head/x11-wm/golem/Makefile Thu Jan 23 00:48:05 2014 (r340774)
+++ head/x11-wm/golem/Makefile Thu Jan 23 03:06:15 2014 (r340775)
@@ -14,20 +14,15 @@ LICENSE= BSD
OPTIONS_DEFINE= ESOUND XINERAMA
OPTIONS_DEFAULT= XINERAMA
-USES= perl5
+USES= perl5 gmake
USE_PERL5= build
USE_BZIP2= yes
USE_XORG= xpm
WANT_GNOME= yes
-USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-i18n
MAKE_ARGS= DEVEL=1
-MANCOMPRESSED= yes
-MAN1= golem.1
-
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
Added: head/x11-wm/golem/files/patch-Makefile.rules.gnu.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/golem/files/patch-Makefile.rules.gnu.in Thu Jan 23 03:06:15 2014 (r340775)
@@ -0,0 +1,45 @@
+--- Makefile.rules.gnu.in.orig 2014-01-22 17:53:46.492137556 +0800
++++ Makefile.rules.gnu.in 2014-01-22 17:58:12.855113204 +0800
+@@ -179,17 +179,17 @@ menuconfig:
+
+ install-bin: @INSTALL_PLUGINS@
+ cd $(GOLEM_HOME)
+- @INSTALL@ -d $(bindir)
+- @INSTALL@ build-bin/golem $(bindir)
+- @INSTALL@ build-bin/golem.install $(bindir)
++ @INSTALL@ -d $(DESTDIR)$(bindir)
++ @INSTALL@ build-bin/golem $(DESTDIR)$(bindir)
++ @INSTALL@ build-bin/golem.install $(DESTDIR)$(bindir)
+
+ install-plugins: all
+- @INSTALL@ -d $(libdir)/golem/plugins
++ @INSTALL@ -d $(DESTDIR)$(libdir)/golem/plugins
+ files=`( cd $(GOLEM_HOME)/src ; perl ./listmods.pl $(GOLEM_HOME) dynamic )` ; \
+ for i in $$files ; do \
+ cd $(GOLEM_HOME); \
+ if [ -f build-plugin/$$i.so ] ; then \
+- @INSTALL@ build-plugin/$$i.so $(libdir)/golem/plugins/ ; \
++ @INSTALL@ build-plugin/$$i.so $(DESTDIR)$(libdir)/golem/plugins/ ; \
+ fi ; \
+ done
+
+@@ -197,15 +197,15 @@ install-data:
+ cd $(GOLEM_HOME); \
+ cd sample.golem ; \
+ for i in `find . -type d | grep -v CVS` ; do \
+- @INSTALL@ -d $(datadir)/golem/$$i ; \
++ @INSTALL@ -d $(DESTDIR)$(datadir)/golem/$$i ; \
+ done ; \
+ for i in `find . -type f | grep -v CVS` ; do \
+- @INSTALL@ -m 444 $$i $(datadir)/golem/$$i ; \
++ @INSTALL@ -m 444 $$i $(DESTDIR)$(datadir)/golem/$$i ; \
+ done
+
+ install-man:
+- @INSTALL@ -d $(mandir)/man1
+- @INSTALL@ -m 444 doc/golem.1.gz $(mandir)/man1/
++ @INSTALL@ -d $(DESTDIR)$(mandir)/man1
++ @INSTALL@ -m 444 doc/golem.1.gz $(DESTDIR)$(mandir)/man1/
+
+ ifeq ($(shell echo $$PWD),$(GOLEM_HOME))
+ install: all install-bin install-data install-man
Modified: head/x11-wm/golem/pkg-plist
==============================================================================
--- head/x11-wm/golem/pkg-plist Thu Jan 23 00:48:05 2014 (r340774)
+++ head/x11-wm/golem/pkg-plist Thu Jan 23 03:06:15 2014 (r340775)
@@ -13,6 +13,7 @@ lib/golem/plugins/simple_menus.so
lib/golem/plugins/start_slide.so
lib/golem/plugins/tasklist.so
lib/golem/plugins/wmclass_defs.so
+man/man1/golem.1.gz
%%DATADIR%%/golemrc
%%DATADIR%%/plugins/animations/rc
%%DATADIR%%/plugins/box_iconify/rc
@@ -173,42 +174,6 @@ lib/golem/plugins/wmclass_defs.so
%%DATADIR%%/themes/eBlueSteel/styles/small.rc
%%DATADIR%%/themes/eBlueSteel/styles/transient.rc
%%DATADIR%%/themes/eBlueSteel/styles/verysmall.rc
-%%DATADIR%%/themes/microGUI/bar_left_top.xpm
-%%DATADIR%%/themes/microGUI/bar_left_top_unfoc.xpm
-%%DATADIR%%/themes/microGUI/bar_vert.xpm
-%%DATADIR%%/themes/microGUI/bottom.xpm
-%%DATADIR%%/themes/microGUI/bottom_far.xpm
-%%DATADIR%%/themes/microGUI/bottom_near.xpm
-%%DATADIR%%/themes/microGUI/close.xpm
-%%DATADIR%%/themes/microGUI/close_clicked.xpm
-%%DATADIR%%/themes/microGUI/close_unfoc.xpm
-%%DATADIR%%/themes/microGUI/forplug/pager/focpagedwin.xpm
-%%DATADIR%%/themes/microGUI/forplug/pager/pagedwin.xpm
-%%DATADIR%%/themes/microGUI/forplug/pager/rc
-%%DATADIR%%/themes/microGUI/forplug/pier/rc
-%%DATADIR%%/themes/microGUI/forplug/pier/tile.xpm
-%%DATADIR%%/themes/microGUI/forplug/start_slide/greybg.xpm
-%%DATADIR%%/themes/microGUI/forplug/start_slide/logo.xpm
-%%DATADIR%%/themes/microGUI/forplug/start_slide/rc
-%%DATADIR%%/themes/microGUI/forplug/start_slide/trim.xpm
-%%DATADIR%%/themes/microGUI/maximize.xpm
-%%DATADIR%%/themes/microGUI/maximize_clicked.xpm
-%%DATADIR%%/themes/microGUI/maximize_unfoc.xpm
-%%DATADIR%%/themes/microGUI/minimize.xpm
-%%DATADIR%%/themes/microGUI/minimize_clicked.xpm
-%%DATADIR%%/themes/microGUI/minimize_unfoc.xpm
-%%DATADIR%%/themes/microGUI/rc
-%%DATADIR%%/themes/microGUI/top_blue.xpm
-%%DATADIR%%/themes/microGUI/top_blue_unfoc.xpm
-%%DATADIR%%/themes/microGUI/top_bluetowhite.xpm
-%%DATADIR%%/themes/microGUI/top_bluetowhite_unfoc.xpm
-%%DATADIR%%/themes/microGUI/top_far.xpm
-%%DATADIR%%/themes/microGUI/top_near.xpm
-%%DATADIR%%/themes/microGUI/top_near_unfoc.xpm
-%%DATADIR%%/themes/microGUI/top_white.xpm
-%%DATADIR%%/themes/microGUI/transient_top.xpm
-%%DATADIR%%/themes/microGUI/transient_top_far.xpm
-%%DATADIR%%/themes/microGUI/transient_top_near.xpm
%%DATADIR%%/themes/microGUI-shading/bar_left_top.xpm
%%DATADIR%%/themes/microGUI-shading/bar_left_top_unfoc.xpm
%%DATADIR%%/themes/microGUI-shading/bar_vert.xpm
@@ -273,6 +238,42 @@ lib/golem/plugins/wmclass_defs.so
%%DATADIR%%/themes/microGUI-shading/transient_top.xpm
%%DATADIR%%/themes/microGUI-shading/transient_top_far.xpm
%%DATADIR%%/themes/microGUI-shading/transient_top_near.xpm
+%%DATADIR%%/themes/microGUI/bar_left_top.xpm
+%%DATADIR%%/themes/microGUI/bar_left_top_unfoc.xpm
+%%DATADIR%%/themes/microGUI/bar_vert.xpm
+%%DATADIR%%/themes/microGUI/bottom.xpm
+%%DATADIR%%/themes/microGUI/bottom_far.xpm
+%%DATADIR%%/themes/microGUI/bottom_near.xpm
+%%DATADIR%%/themes/microGUI/close.xpm
+%%DATADIR%%/themes/microGUI/close_clicked.xpm
+%%DATADIR%%/themes/microGUI/close_unfoc.xpm
+%%DATADIR%%/themes/microGUI/forplug/pager/focpagedwin.xpm
+%%DATADIR%%/themes/microGUI/forplug/pager/pagedwin.xpm
+%%DATADIR%%/themes/microGUI/forplug/pager/rc
+%%DATADIR%%/themes/microGUI/forplug/pier/rc
+%%DATADIR%%/themes/microGUI/forplug/pier/tile.xpm
+%%DATADIR%%/themes/microGUI/forplug/start_slide/greybg.xpm
+%%DATADIR%%/themes/microGUI/forplug/start_slide/logo.xpm
+%%DATADIR%%/themes/microGUI/forplug/start_slide/rc
+%%DATADIR%%/themes/microGUI/forplug/start_slide/trim.xpm
+%%DATADIR%%/themes/microGUI/maximize.xpm
+%%DATADIR%%/themes/microGUI/maximize_clicked.xpm
+%%DATADIR%%/themes/microGUI/maximize_unfoc.xpm
+%%DATADIR%%/themes/microGUI/minimize.xpm
+%%DATADIR%%/themes/microGUI/minimize_clicked.xpm
+%%DATADIR%%/themes/microGUI/minimize_unfoc.xpm
+%%DATADIR%%/themes/microGUI/rc
+%%DATADIR%%/themes/microGUI/top_blue.xpm
+%%DATADIR%%/themes/microGUI/top_blue_unfoc.xpm
+%%DATADIR%%/themes/microGUI/top_bluetowhite.xpm
+%%DATADIR%%/themes/microGUI/top_bluetowhite_unfoc.xpm
+%%DATADIR%%/themes/microGUI/top_far.xpm
+%%DATADIR%%/themes/microGUI/top_near.xpm
+%%DATADIR%%/themes/microGUI/top_near_unfoc.xpm
+%%DATADIR%%/themes/microGUI/top_white.xpm
+%%DATADIR%%/themes/microGUI/transient_top.xpm
+%%DATADIR%%/themes/microGUI/transient_top_far.xpm
+%%DATADIR%%/themes/microGUI/transient_top_near.xpm
%%DATADIR%%/themes/twm/barchecker.xpm
%%DATADIR%%/themes/twm/bborder.xpm
%%DATADIR%%/themes/twm/bborder_unf.xpm
Modified: head/x11-wm/matwm2/Makefile
==============================================================================
--- head/x11-wm/matwm2/Makefile Thu Jan 23 00:48:05 2014 (r340774)
+++ head/x11-wm/matwm2/Makefile Thu Jan 23 03:06:15 2014 (r340775)
@@ -15,8 +15,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --cc=${CC} --prefix=${PREFIX} --mandir=${MANPREFIX}/man
USE_XORG= x11 xext xinerama xft
-PLIST_FILES= bin/matwm2
-MAN1= matwm2.1
+PLIST_FILES= bin/matwm2 man/man1/${PORTNAME}.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
Modified: head/x11-wm/matwm2/files/patch-Makefile.in
==============================================================================
--- head/x11-wm/matwm2/files/patch-Makefile.in Thu Jan 23 00:48:05 2014 (r340774)
+++ head/x11-wm/matwm2/files/patch-Makefile.in Thu Jan 23 03:06:15 2014 (r340775)
@@ -1,14 +1,14 @@
---- Makefile.in.old 2010-01-30 00:39:35.000000000 +0100
-+++ Makefile.in 2010-01-30 00:39:56.000000000 +0100
-@@ -23,9 +23,8 @@
+--- Makefile.in.orig 2010-04-07 00:26:55.000000000 +0800
++++ Makefile.in 2014-01-22 17:50:49.193140832 +0800
+@@ -23,9 +23,8 @@ clean:
$(RM) matwm2 *.o
install: matwm2
- mkdir -p $(PREFIX)/bin $(MANDIR)/man1
- install -s matwm2 $(PREFIX)/bin
- install matwm2.1 $(MANDIR)/man1
-+ ${BSD_INSTALL_PROGRAM} matwm2 $(PREFIX)/bin
-+ ${BSD_INSTALL_MAN} matwm2.1 $(MANDIR)/man1
++ ${BSD_INSTALL_PROGRAM} matwm2 $(DESTDIR)$(PREFIX)/bin
++ ${BSD_INSTALL_MAN} matwm2.1 $(DESTDIR)$(MANDIR)/man1
deinstall:
$(RM) $(PREFIX)/bin/matwm2 $(MANDIR)/man1/matwm2.1* $(MANDIR)/cat1/matwm2.1*
More information about the svn-ports-all
mailing list