diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2014-03-14 10:12:29 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2014-03-14 10:12:29 +0000 |
| commit | 25b773673e20d99e0dfc671d354eaa3c23b66140 (patch) | |
| tree | e0511fbadff71a71a1cf7b785ca89c0df06e1d56 /sysutils/nvclock | |
| parent | 2500bbb9d0dd043d26d971dd395f5bdba39d8728 (diff) | |
Notes
Diffstat (limited to 'sysutils/nvclock')
| -rw-r--r-- | sysutils/nvclock/Makefile | 38 | ||||
| -rw-r--r-- | sysutils/nvclock/files/patch-src::Makefile.in | 22 |
2 files changed, 38 insertions, 22 deletions
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile index 4db0c8b2db50..c2ca40e5fef4 100644 --- a/sysutils/nvclock/Makefile +++ b/sysutils/nvclock/Makefile @@ -3,7 +3,7 @@ PORTNAME= nvclock DISTVERSION= 0.8b4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.8%20%28beta4%29 DISTNAME= nvclock${DISTVERSION} @@ -16,8 +16,7 @@ LICENSE= GPLv2 USES= gmake GNU_CONFIGURE= yes -PLIST_FILES= bin/nvclock bin/smartdimmer -MAN1= nvclock.1 +PLIST_FILES= bin/nvclock bin/smartdimmer man/man1/nvclock.1.gz PORTDOCS= ABOUT AUTHORS ChangeLog FAQ README OPTIONS_DEFINE= NVCONTROL X11 DOCS @@ -26,21 +25,19 @@ OPTIONS_DEFAULT= NVCONTROL X11 NVCONTROL_DESC= NV-CONTROL support (for OpenGL settings) X11_DESC= Build GUI program (requires GTK+ 2.x) -NO_STAGE= yes -.include <bsd.port.options.mk> +NVCONTROL_USE= XORG=xext +NVCONTROL_USES= pkgconfig +NVCONTROL_CONFIGURE_OFF= --disable-nvcontrol -.if ${PORT_OPTIONS:MNVCONTROL} -USE_XORG= xext -USES+= pkgconfig -.else -CONFIGURE_ARGS+= --disable-nvcontrol -.endif +X11_USE= GNOME=gtk20 +X11_PLIST_FILES= bin/nvclock_gtk share/applications/nvclock.desktop \ + share/icons/hicolor/48x48/apps/nvclock.png +X11_CONFIGURE_OFF= --disable-gtk + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} -USE_GNOME= gtk20 -PLIST_FILES+= bin/nvclock_gtk -.else -CONFIGURE_ARGS+= --disable-gtk +INSTALLS_ICONS= yes .endif post-patch: @@ -49,12 +46,9 @@ post-patch: ${WRKSRC}/src/gtk/Makefile.in \ ${WRKSRC}/src/qt/Makefile.in \ ${WRKSRC}/src/nvcontrol/Makefile.in - -do-install: - ${GMAKE} -C ${WRKSRC}/src install - ${GMAKE} -C ${WRKSRC} install-man -.if ${PORT_OPTIONS:MDOCS} - ${GMAKE} -C ${WRKSRC} install-docs -.endif +# Prevent recursive prepending of DESTDIR + @${REINPLACE_CMD} -E '/exec_prefix|bindir/s|\$$\(DESTDIR\)||' \ + ${WRKSRC}/src/gtk/Makefile.in \ + ${WRKSRC}/src/qt/Makefile.in .include <bsd.port.mk> diff --git a/sysutils/nvclock/files/patch-src::Makefile.in b/sysutils/nvclock/files/patch-src::Makefile.in index 5aa512f2b0ec..ec731ffb031a 100644 --- a/sysutils/nvclock/files/patch-src::Makefile.in +++ b/sysutils/nvclock/files/patch-src::Makefile.in @@ -1,5 +1,16 @@ --- src/Makefile.in.orig 2010-09-08 12:09:22.000000000 +0800 +++ src/Makefile.in 2010-09-07 22:23:40.000000000 +0800 +@@ -9,8 +9,8 @@ + libnvcontrol=./nvcontrol/libnvcontrol.a + + prefix=$(DESTDIR)@prefix@ +-exec_prefix=$(DESTDIR)@exec_prefix@ +-bindir=$(DESTDIR)@bindir@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ + + ifeq ($(HAVE_NVCONTROL), yes) + DEPS=$(libbackend) $(libnvcontrol) @@ -27,7 +27,7 @@ distclean install install-app install-recursive @@ -18,3 +29,14 @@ clean: clean-recursive clean-app clean-app: +@@ -50,8 +52,8 @@ + install: install-recursive install-app + install-app: + mkdir -p $(bindir) +- $(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock +- $(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer ++ $(INSTALL) -c nvclock $(bindir)/nvclock ++ $(INSTALL) -c smartdimmer $(bindir)/smartdimmer + + + uninstall: uninstall-recursive uninstall-app |