[Midnightbsd-cvs] mports [20789] trunk/sysutils/nvclock: fix nvclock build

[laffer1 at midnightbsd.org]

Revision: 20789
          http://svnweb.midnightbsd.org/mports/?rev=20789
Author:   laffer1
Date:     2015-11-12 21:25:54 -0500 (Thu, 12 Nov 2015)
Log Message:
-----------
fix nvclock build

Modified Paths:
--------------
    trunk/sysutils/nvclock/Makefile
    trunk/sysutils/nvclock/pkg-plist

Added Paths:
-----------
    trunk/sysutils/nvclock/files/patch-src__Makefile.in

Removed Paths:
-------------
    trunk/sysutils/nvclock/files/patch-src::Makefile.in

Property Changed:
----------------
    trunk/sysutils/nvclock/files/patch-configure

Modified: trunk/sysutils/nvclock/Makefile
===================================================================
--- trunk/sysutils/nvclock/Makefile	2015-11-13 02:20:28 UTC (rev 20788)
+++ trunk/sysutils/nvclock/Makefile	2015-11-13 02:25:54 UTC (rev 20789)
@@ -23,20 +23,19 @@
 NVCONTROL_DESC=	NV-CONTROL support (for OpenGL settings)
 X11_DESC=	Build GUI program (requires GTK+ 2.x)
 
+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
+
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MNVCONTROL}
-USE_XORG=	xext
-USES+=		pkgconfig
-.else
-CONFIGURE_ARGS+=	--disable-nvcontrol
-.endif
-
 .if ${PORT_OPTIONS:MX11}
-USE_GNOME=	gtk20
-PLIST_FILES+=	bin/nvclock_gtk
-.else
-CONFIGURE_ARGS+=	--disable-gtk
+INSTALLS_ICONS=	yes
 .endif
 
 post-patch:
@@ -45,12 +44,11 @@
 		${WRKSRC}/src/gtk/Makefile.in \
 		${WRKSRC}/src/qt/Makefile.in \
 		${WRKSRC}/src/nvcontrol/Makefile.in
+# Prevent recursive prepending of DESTDIR
+	@${REINPLACE_CMD} -E '/exec_prefix|bindir/s|\$$\(DESTDIR\)||' \
+		${WRKSRC}/src/gtk/Makefile.in \
+		${WRKSRC}/src/qt/Makefile.in
+	@${REINPLACE_CMD} 's/-lnvcontrol/& @X11_LIBS@/' \
+		${WRKSRC}/src/gtk/Makefile.in
 
-do-install:
-	${GMAKE} -C ${WRKSRC}/src install
-	${GMAKE} -C ${WRKSRC} install-man
-.if ${PORT_OPTIONS:MDOCS}
-	${GMAKE} -C ${WRKSRC} install-docs
-.endif
-
 .include <bsd.port.mk>

Index: trunk/sysutils/nvclock/files/patch-configure
===================================================================
--- trunk/sysutils/nvclock/files/patch-configure	2015-11-13 02:20:28 UTC (rev 20788)
+++ trunk/sysutils/nvclock/files/patch-configure	2015-11-13 02:25:54 UTC (rev 20789)

Property changes on: trunk/sysutils/nvclock/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/sysutils/nvclock/files/patch-src::Makefile.in
===================================================================
--- trunk/sysutils/nvclock/files/patch-src::Makefile.in	2015-11-13 02:20:28 UTC (rev 20788)
+++ trunk/sysutils/nvclock/files/patch-src::Makefile.in	2015-11-13 02:25:54 UTC (rev 20789)
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig	2010-09-08 12:09:22.000000000 +0800
-+++ src/Makefile.in	2010-09-07 22:23:40.000000000 +0800
-@@ -27,7 +27,7 @@
- 	distclean install install-app install-recursive
- 
- 
--all: all-recursive nvclock smartdimmer
-+all: nvclock smartdimmer
- 
- 
- nvclock: $(DEPS) $(LIB) nvclock.c
-@@ -36,6 +36,8 @@
- smartdimmer: $(DEPS) $(LIB) smartdimmer.c
- 	$(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
- 
-+$(DEPS): all-recursive
-+
- 
- clean: clean-recursive clean-app
- clean-app:

Copied: trunk/sysutils/nvclock/files/patch-src__Makefile.in (from rev 20629, trunk/sysutils/nvclock/files/patch-src::Makefile.in)
===================================================================
--- trunk/sysutils/nvclock/files/patch-src__Makefile.in	                        (rev 0)
+++ trunk/sysutils/nvclock/files/patch-src__Makefile.in	2015-11-13 02:25:54 UTC (rev 20789)
@@ -0,0 +1,42 @@
+--- 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
+ 
+ 
+-all: all-recursive nvclock smartdimmer
++all: nvclock smartdimmer
+ 
+ 
+ nvclock: $(DEPS) $(LIB) nvclock.c
+@@ -36,6 +36,8 @@
+ smartdimmer: $(DEPS) $(LIB) smartdimmer.c
+ 	$(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
+ 
++$(DEPS): all-recursive
++
+ 
+ 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

Modified: trunk/sysutils/nvclock/pkg-plist
===================================================================
--- trunk/sysutils/nvclock/pkg-plist	2015-11-13 02:20:28 UTC (rev 20788)
+++ trunk/sysutils/nvclock/pkg-plist	2015-11-13 02:25:54 UTC (rev 20789)
@@ -1,4 +1,3 @@
 bin/nvclock
-%%GTK%%bin/nvclock_gtk
 bin/smartdimmer
 man/man1/nvclock.1.gz