svn commit: r508395 - in head/deskutils/menumaker: . files

[Jason Helfman]

Author: jgh
Date: Thu Aug  8 17:00:58 2019
New Revision: 508395
URL: https://svnweb.freebsd.org/changeset/ports/508395

Log:
  - Make menumaker configure script properly find python.
  - Change configure to look for python3.5 and python3.6, as well as older
    versions.
  - Add LDFLAGS to make it possible for the configure script to find python
    libraries.  Actually use python in Makefile.in.
  
  Reviewed by/with: zeising@

Added:
  head/deskutils/menumaker/files/patch-configure   (contents, props changed)
Modified:
  head/deskutils/menumaker/Makefile
  head/deskutils/menumaker/files/patch-Makefile.in

Modified: head/deskutils/menumaker/Makefile
==============================================================================
--- head/deskutils/menumaker/Makefile	Thu Aug  8 16:48:41 2019	(r508394)
+++ head/deskutils/menumaker/Makefile	Thu Aug  8 17:00:58 2019	(r508395)
@@ -12,11 +12,12 @@ COMMENT=	Menu generator for X Window Managers and desk
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake python shebangfix
+USES=		gmake python
+
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 
-SHEBANG_FILES= 	${WRKSRC}/mmaker
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		mmaker
 

Modified: head/deskutils/menumaker/files/patch-Makefile.in
==============================================================================
--- head/deskutils/menumaker/files/patch-Makefile.in	Thu Aug  8 16:48:41 2019	(r508394)
+++ head/deskutils/menumaker/files/patch-Makefile.in	Thu Aug  8 17:00:58 2019	(r508395)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-06-23 10:18:34 UTC
+--- Makefile.in.orig	2019-07-21 13:18:07 UTC
 +++ Makefile.in
-@@ -835,6 +835,7 @@ uninstall-am: uninstall-dist_binSCRIPTS 
+@@ -851,12 +851,13 @@ uninstall-am: uninstall-dist_binSCRIPTS \
  
  
  install-exec-local :
@@ -8,3 +8,10 @@
  	echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker
  	echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker
  	echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker
+ 
+ install-data-local :
+-	$(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
++	$(PYTHON_BIN) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

Added: head/deskutils/menumaker/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/menumaker/files/patch-configure	Thu Aug  8 17:00:58 2019	(r508395)
@@ -0,0 +1,11 @@
+--- configure.orig	2019-08-08 16:26:40 UTC
++++ configure
+@@ -3507,7 +3507,7 @@ fi
+ $as_echo_n "checking for python build information... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+-for python in python3 python3.4 python3.3 python3.2 python3.1 python3.0 python python2.7; do
++for python in python3 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python python2.7; do
+ for ac_prog in $python
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.