diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-07-02 02:41:27 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-07-02 02:41:27 +0000 |
| commit | 57acaa4896957e3fc7e8faa506daa8e1ca0337bf (patch) | |
| tree | 4ba17027ff16f6de66b75a0d02a0174cc6eb4a84 /x11-wm | |
| parent | Update to 3.1.5; use staging and libtool fixes; strip; (diff) | |
Stagify.
Approved by: portmgr@ (blanket approval)
Notes
Notes:
svn path=/head/; revision=360127
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fluxconf/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/fluxconf/files/patch-src-Makefile.in | 20 |
2 files changed, 22 insertions, 3 deletions
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile index 3522183f81a3..433b25f98b3f 100644 --- a/x11-wm/fluxconf/Makefile +++ b/x11-wm/fluxconf/Makefile @@ -22,13 +22,12 @@ PLIST_FILES= bin/fluxbare bin/fluxconf bin/fluxkeys bin/fluxmenu \ OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11-wm/fluxconf/files/patch-src-Makefile.in b/x11-wm/fluxconf/files/patch-src-Makefile.in new file mode 100644 index 000000000000..b227e0f5cf5b --- /dev/null +++ b/x11-wm/fluxconf/files/patch-src-Makefile.in @@ -0,0 +1,20 @@ +--- src/Makefile.in.orig 2014-07-02 09:52:27.339956716 +0800 ++++ src/Makefile.in 2014-07-02 09:53:51.070931248 +0800 +@@ -645,12 +645,12 @@ uninstall-info: uninstall-info-recursive + #fluxkeys: fluxconf + # ln -sf fluxconf fluxkeys + install-exec-hook: +- @ln -sf $(bindir)/fluxconf $(bindir)/fluxkeys +- @ln -sf $(bindir)/fluxconf $(bindir)/fluxbare +- @if ldd fluxconf |grep pango > /dev/null ; then ln -sf $(bindir)/fluxconf $(bindir)/fluxmenu; fi ++ @ln -sf fluxconf $(DESTDIR)$(bindir)/fluxkeys ++ @ln -sf fluxconf $(DESTDIR)$(bindir)/fluxbare ++ @if ldd fluxconf |grep pango > /dev/null ; then ln -sf fluxconf $(DESTDIR)$(bindir)/fluxmenu; fi + @for lan in ${ALL_LANG} ; do \ +- ${mkinstalldirs} $(datadir)/locale/$$lan/LC_MESSAGES; \ +- ${INSTALL} -m444 $(top_srcdir)/po/$$lan.mo $(datadir)/locale/$$lan/LC_MESSAGES/fluxconf.mo ;\ ++ ${mkinstalldirs} $(DESTDIR)$(datadir)/locale/$$lan/LC_MESSAGES; \ ++ ${INSTALL} -m444 $(top_srcdir)/po/$$lan.mo $(DESTDIR)$(datadir)/locale/$$lan/LC_MESSAGES/fluxconf.mo ;\ + done ; + + uninstall-local: |