Date: Fri, 14 Mar 2014 10:12:29 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348199 - in head/sysutils/nvclock: . files Message-ID: <201403141012.s2EACT5V019524@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Mar 14 10:12:29 2014 New Revision: 348199 URL: http://svnweb.freebsd.org/changeset/ports/348199 QAT: https://qat.redports.org/buildarchive/r348199/ Log: - Stagify the port, use OPTIONS helpers - Get rid of no longer necessary `do-install' target - Install couple of useful files while here Modified: head/sysutils/nvclock/Makefile head/sysutils/nvclock/files/patch-src::Makefile.in Modified: head/sysutils/nvclock/Makefile ============================================================================== --- head/sysutils/nvclock/Makefile Fri Mar 14 10:10:50 2014 (r348198) +++ head/sysutils/nvclock/Makefile Fri Mar 14 10:12:29 2014 (r348199) @@ -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 + +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 -.if ${PORT_OPTIONS:MNVCONTROL} -USE_XORG= xext -USES+= pkgconfig -.else -CONFIGURE_ARGS+= --disable-nvcontrol -.endif +.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> Modified: head/sysutils/nvclock/files/patch-src::Makefile.in ============================================================================== --- head/sysutils/nvclock/files/patch-src::Makefile.in Fri Mar 14 10:10:50 2014 (r348198) +++ head/sysutils/nvclock/files/patch-src::Makefile.in Fri Mar 14 10:12:29 2014 (r348199) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403141012.s2EACT5V019524>