diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-07-02 03:30:43 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-07-02 03:30:43 +0000 |
commit | c123ad83e544e5c1d87cf501425b08c598718ed1 (patch) | |
tree | ccb0548501c776d93a5a4f3387c363f6d4e4766e /x11-wm | |
parent | 1: Stagify. (diff) |
1: Stagify.
2: use @sample to handle sample config file.
3: bump version.
Approved by: portmgr@ (blanket approval)
Notes
Notes:
svn path=/head/; revision=360129
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/ion/Makefile | 5 | ||||
-rw-r--r-- | x11-wm/ion/files/patch-Makefile | 55 | ||||
-rw-r--r-- | x11-wm/ion/files/patch-src-Makefile | 12 | ||||
-rw-r--r-- | x11-wm/ion/pkg-plist | 33 |
4 files changed, 84 insertions, 21 deletions
diff --git a/x11-wm/ion/Makefile b/x11-wm/ion/Makefile index 1f564159e1ad..660916989d80 100644 --- a/x11-wm/ion/Makefile +++ b/x11-wm/ion/Makefile @@ -3,7 +3,7 @@ PORTNAME= ion PORTVERSION= 20020207 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/archives/ @@ -12,10 +12,7 @@ COMMENT= A window manager with a text-editorish, keyboard friendly interface CONFLICTS= ion-2-* -MAN1= ion.1x - USE_XORG= x11 USES= gmake -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-wm/ion/files/patch-Makefile b/x11-wm/ion/files/patch-Makefile new file mode 100644 index 000000000000..83b8d1fee707 --- /dev/null +++ b/x11-wm/ion/files/patch-Makefile @@ -0,0 +1,55 @@ +--- Makefile.orig 2014-07-02 11:22:29.181567830 +0800 ++++ Makefile 2014-07-02 11:24:31.679559320 +0800 +@@ -17,7 +17,7 @@ SCRIPTS=scripts/ion-edit scripts/ion-man + + ETC= etc/bindings-default.conf etc/bindings-sun.conf etc/kludges.conf \ + etc/look-brownsteel.conf etc/look-greyviolet.conf \ +- etc/look-simpleblue.conf etc/look-wheat.conf etc/sample.conf ++ etc/look-simpleblue.conf etc/look-wheat.conf + + DOCS= README LICENSE ChangeLog doc/config.txt doc/functions.txt + +@@ -31,34 +31,22 @@ man/ion.1x: man/ion.1x.in + sed 's#PREFIX#$(PREFIX)#g' man/ion.1x.in > man/ion.1x + + _install: +- $(INSTALLDIR) $(BINDIR) ++ $(INSTALLDIR) $(DESTDIR)$(BINDIR) + for i in $(SCRIPTS); do \ +- $(INSTALL) -m $(BIN_MODE) $$i $(BINDIR); \ ++ $(INSTALL) -m $(BIN_MODE) $$i $(DESTDIR)$(BINDIR); \ + done + +- $(INSTALLDIR) $(MANDIR)/man1 +- $(INSTALL) -m $(DATA_MODE) man/ion.1x $(MANDIR)/man1 ++ $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) -m $(DATA_MODE) man/ion.1x $(DESTDIR)$(MANDIR)/man1 + +- $(INSTALLDIR) $(DOCDIR)/ion ++ $(INSTALLDIR) $(DESTDIR)$(DOCDIR)/ion + for i in $(DOCS); do \ +- $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/ion; \ ++ $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(DOCDIR)/ion; \ + done + +- $(INSTALLDIR) $(ETCDIR)/ion ++ $(INSTALLDIR) $(DESTDIR)$(ETCDIR)/ion + for i in $(ETC); do \ +- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/ion; \ ++ $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(ETCDIR)/ion; \ + done +- +- @ if test -f $(ETCDIR)/ion/ion.conf ; then \ +- echo "$(ETCDIR)/ion/ion.conf already exists. Not installing one."; \ +- else \ +- echo "Installing configuration file $(ETCDIR)/ion/ion.conf"; \ +- if uname -s -p|grep "SunOS sparc" > /dev/null; then \ +- sed s/bindings-default/bindings-sun/ \ +- $(ETCDIR)/ion/sample.conf > $(ETCDIR)/ion/ion.conf; \ +- chmod $(DATA_MODE) $(ETCDIR)/ion/ion.conf; \ +- else \ +- cp $(ETCDIR)/ion/sample.conf $(ETCDIR)/ion/ion.conf; \ +- fi; \ +- fi ++ $(INSTALL) -m $(DATA_MODE) etc/sample.conf $(DESTDIR)$(ETCDIR)/ion/ion.conf.sample; + diff --git a/x11-wm/ion/files/patch-src-Makefile b/x11-wm/ion/files/patch-src-Makefile new file mode 100644 index 000000000000..3fecb404b7c8 --- /dev/null +++ b/x11-wm/ion/files/patch-src-Makefile @@ -0,0 +1,12 @@ +--- src/Makefile.orig 2014-07-02 11:27:14.555548726 +0800 ++++ src/Makefile 2014-07-02 11:27:31.345550958 +0800 +@@ -35,6 +35,6 @@ ion: $(OBJS) $(EXT_OBJS) + $(CC) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@ + + _install: +- $(INSTALLDIR) $(BINDIR) +- $(INSTALL) -m $(BIN_MODE) ion $(BINDIR) +- $(STRIP) $(BINDIR)/ion ++ $(INSTALLDIR) $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m $(BIN_MODE) ion $(DESTDIR)$(BINDIR) ++ $(STRIP) $(DESTDIR)$(BINDIR)/ion diff --git a/x11-wm/ion/pkg-plist b/x11-wm/ion/pkg-plist index ca4b54d72124..e1bbed26a682 100644 --- a/x11-wm/ion/pkg-plist +++ b/x11-wm/ion/pkg-plist @@ -4,20 +4,19 @@ bin/ion-man bin/ion-runinxterm bin/ion-ssh bin/ion-view -etc/ion/bindings-default.conf -etc/ion/bindings-sun.conf -etc/ion/kludges.conf -etc/ion/look-brownsteel.conf -etc/ion/look-greyviolet.conf -etc/ion/look-simpleblue.conf -etc/ion/look-wheat.conf -@unexec if cmp -s %D/etc/ion/ion.conf %D/etc/ion/sample.conf; then rm -f %D/etc/ion/ion.conf; fi -etc/ion/sample.conf -@exec [ -f %B/ion.conf ] || cp %B/%f %B/ion.conf -share/doc/ion/README -share/doc/ion/LICENSE -share/doc/ion/ChangeLog -share/doc/ion/config.txt -share/doc/ion/functions.txt -@dirrm share/doc/ion -@dirrmtry etc/ion +%%ETCDIR%%/bindings-default.conf +%%ETCDIR%%/bindings-sun.conf +%%ETCDIR%%/kludges.conf +%%ETCDIR%%/look-brownsteel.conf +%%ETCDIR%%/look-greyviolet.conf +%%ETCDIR%%/look-simpleblue.conf +%%ETCDIR%%/look-wheat.conf +man/man1/ion.1x.gz +@sample %%ETCDIR%%/ion.conf.sample +%%DOCSDIR%%/README +%%DOCSDIR%%/LICENSE +%%DOCSDIR%%/ChangeLog +%%DOCSDIR%%/config.txt +%%DOCSDIR%%/functions.txt +@dirrm %%DOCSDIR%% +@dirrmtry %%ETCDIR%% |