diff options
| author | vanilla <vanilla@FreeBSD.org> | 2014-01-09 22:48:54 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2014-01-09 22:48:54 +0800 |
| commit | a6dff2cd2592b3ab0f27912ce940fbd6b634793b (patch) | |
| tree | c5a1df43cdad387744b4ceb00662fb30bee791f4 /x11/imwheel | |
| parent | d31a11de65c2450a375b17b7f8d8eb6fa6b7ca5a (diff) | |
| download | freebsd-ports-gnome-a6dff2cd2592b3ab0f27912ce940fbd6b634793b.tar.gz freebsd-ports-gnome-a6dff2cd2592b3ab0f27912ce940fbd6b634793b.tar.zst freebsd-ports-gnome-a6dff2cd2592b3ab0f27912ce940fbd6b634793b.zip | |
Support stagedir.
Approved by: portmgr (blanket infrastructure)
Diffstat (limited to 'x11/imwheel')
| -rw-r--r-- | x11/imwheel/Makefile | 7 | ||||
| -rw-r--r-- | x11/imwheel/files/patch-Makefile.in | 21 | ||||
| -rw-r--r-- | x11/imwheel/pkg-plist | 3 |
3 files changed, 21 insertions, 10 deletions
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile index c6991f10a227..55476690714f 100644 --- a/x11/imwheel/Makefile +++ b/x11/imwheel/Makefile @@ -18,9 +18,6 @@ USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gpm -MAN1= imwheel.1 - -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -30,8 +27,8 @@ post-patch: post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/EMACS ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/EMACS ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11/imwheel/files/patch-Makefile.in b/x11/imwheel/files/patch-Makefile.in index f70eff7e3b23..ea5f4bb8d54b 100644 --- a/x11/imwheel/files/patch-Makefile.in +++ b/x11/imwheel/files/patch-Makefile.in @@ -1,11 +1,24 @@ ---- Makefile.in.orig Sun Aug 29 06:36:33 2004 -+++ Makefile.in Sun Nov 7 08:30:31 2004 -@@ -215,7 +215,7 @@ +--- Makefile.in.orig 2004-08-29 18:36:33.000000000 +0800 ++++ Makefile.in 2014-01-09 21:48:23.000000000 +0800 +@@ -215,7 +215,7 @@ imwheel_LDADD = @GETOPT_LIBS@ -L$(top_bu imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a man_MANS = imwheel.1 EXTRA_DIST = BUGS FREEBSD EMACS M-BA47 BUGS see imwheel.1.html imwheel.1 TODO imwheelrc @extras_dist@ @mdump_dist@ lefty.sh imwheel.spec slack.sh -ETCDIR = /etc/X11/imwheel +ETCDIR = ${PREFIX}/etc all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -782,9 +782,9 @@ install-exec-hook: + @SUID_TRUE@ chown @suid@ $$progname ; \ + @SUID_TRUE@ chmod u+s $$progname + $(mkinstalldirs) $(ETCDIR) +- -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(ETCDIR)/imwheelrc || true +- -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(ETCDIR)/imwheelrc || true +- -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(ETCDIR)/imwheelrc ++ -[ -f /etc/imwheelrc ] && mv /etc/imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc || true ++ -[ -f /etc/X11/imwheelrc ] && mv /etc/X11/imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc || true ++ -[ -f $(ETCDIR)/imwheelrc ] && install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc.new || install -m 644 imwheelrc $(DESTDIR)$(ETCDIR)/imwheelrc + + extras: $(EXTRA_PROGRAMS) diff --git a/x11/imwheel/pkg-plist b/x11/imwheel/pkg-plist index 1f7b5cdb6349..e37f8bca10ae 100644 --- a/x11/imwheel/pkg-plist +++ b/x11/imwheel/pkg-plist @@ -1,5 +1,6 @@ bin/imwheel etc/imwheelrc -%%PORTDOCS%%%%DOCSDIR%%/README +man/man1/imwheel.1.gz %%PORTDOCS%%%%DOCSDIR%%/EMACS +%%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% |