Attachment 182285 Details for Bug 219050 – [patch] fix shebangs for .py files

[patch] [patch] fix shebangs for .py files

pr-shebang.diff (text/plain), 5.71 KB, created by John Hein on 2017-05-03 16:44:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2017-05-03 16:44:31 UTC

Size: 5.71 KB

patch

obsolete

>Index: esmska/files/esmska.in
>===================================================================
>--- esmska/files/esmska.in	(revision 307414)
>+++ esmska/files/esmska.in	(working copy)
>@@ -3,4 +3,4 @@
> # $FreeBSD$
> 
> cd "%%DATADIR%%"
>-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/esmska.jar" "$@"
>+JAVA_VERSION="%%JAVA_VERSION%%" exec "java" -jar "%%DATADIR%%/esmska.jar" "$@"
>Index: gammu/Makefile
>===================================================================
>--- gammu/Makefile	(revision 309171)
>+++ gammu/Makefile	(working copy)
>@@ -17,7 +17,8 @@
> OPTIONS_DEFINE=	BASHCS
> BASHCS_DESC=	BASH completion script
> 
>-CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
>+#CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
>+CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${PREFIX}/libdata
> 
> USE_CMAKE=	yes
> USE_PYTHON=	yes
>@@ -61,3 +62,5 @@
> .endif
> 
> .include <bsd.port.mk>
>+
>+MAKE_ARGS+= VERBOSE=1
>Index: py-serial/Makefile
>===================================================================
>--- py-serial/Makefile	(revision 399336)
>+++ py-serial/Makefile	(working copy)
>@@ -27,4 +27,29 @@
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
> 
>+du: .USE
>+	@echo "PLIST_SUB: ${PLIST_SUB}."
>+	@echo "PREFIX: ${PREFIX}."
>+	@echo "PYTHONBASE: ${PYTHONBASE}."
>+	@echo "PYTHONPREFIX_SITELIBDIR: ${PYTHONPREFIX_SITELIBDIR}."
>+	@echo "PYTHON_CMD: ${PYTHON_CMD}."
>+	@echo "PYTHON_LIBDIR: ${PYTHON_LIBDIR}."
>+	@echo "PYTHON_SITELIBDIR: ${PYTHON_SITELIBDIR}."
>+	@echo "PYTHON_VER: ${PYTHON_VER}."
>+	@echo "PYTHON_VERSION: ${PYTHON_VERSION}."
>+
>+d0: du
>+
>+#${SITELOCALBASE}?= ${LOCALBASE}
>+#.if ${SITELOCALBASE} != ${LOCALBASE}
>+#IGNORE_PYTHONPREFIX_FEATURE=1
>+#.endif
>+
> .include <bsd.port.mk>
>+
>+#${SITELOCALBASE}?= ${LOCALBASE}
>+#.if ${SITELOCALBASE} != ${LOCALBASE}
>+#IGNORE_PYTHONPREFIX_FEATURE=1
>+#.endif
>+
>+d1: du
>Index: rxtx/Makefile
>===================================================================
>--- rxtx/Makefile	(revision 307414)
>+++ rxtx/Makefile	(working copy)
>@@ -34,3 +34,50 @@
> 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure ${WRKSRC}/ltconfig
> 
> .include <bsd.port.mk>
>+
>+p:
>+	@echo "JAVASHAREDIR: ${JAVASHAREDIR}."
>+	@echo "JAVAJARDIR: ${JAVAJARDIR}."
>+	@echo "JAVALIBDIR: ${JAVALIBDIR}."
>+	@echo "__JAVA_VERSION_LIST: ${__JAVA_VERSION_LIST}."
>+	@echo "_JAVA_VERSION_LIST: ${_JAVA_VERSION_LIST}."
>+	@echo "_JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO: ${_JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO}."
>+	@echo "_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO: ${_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO}."
>+	@echo "_JAVA_PREFERRED_PORTS: ${_JAVA_PREFERRED_PORTS}."
>+	@echo "_JAVA_PORTS_ALL: ${_JAVA_PORTS_ALL}."
>+	@echo "_JAVA_VERSION_LIST_REGEXP: ${_JAVA_VERSION_LIST_REGEXP}."
>+	@echo "_JAVA_VENDOR_LIST_REGEXP: ${_JAVA_VENDOR_LIST_REGEXP}."
>+	@echo "_JAVA_OS_LIST_REGEXP: ${_JAVA_OS_LIST_REGEXP}."
>+	@echo "_JAVA_VERSION: ${_JAVA_VERSION}."
>+	@echo "_JAVA_OS: ${_JAVA_OS}."
>+	@echo "_JAVA_VENDOR: ${_JAVA_VENDOR}."
>+	@echo "A_JAVA_PORT_INFO: ${A_JAVA_PORT_INFO}."
>+	@echo "A_JAVA_PORT_HOME: ${A_JAVA_PORT_HOME}."
>+	@echo "A_JAVA_PORT_VERSION: ${A_JAVA_PORT_VERSION}."
>+	@echo "A_JAVA_PORT_OS: ${A_JAVA_PORT_OS}."
>+	@echo "A_JAVA_PORT_VENDOR: ${A_JAVA_PORT_VENDOR}."
>+	@echo "A_JAVA_PORT_INSTALLED: ${A_JAVA_PORT_INSTALLED}."
>+	@echo "__JAVA_PORTS_INSTALLED: ${__JAVA_PORTS_INSTALLED}."
>+	@echo "A_JAVA_PORT_POSSIBLE: ${A_JAVA_PORT_POSSIBLE}."
>+	@echo "__JAVA_PORTS_POSSIBLE: ${__JAVA_PORTS_POSSIBLE}."
>+	@echo "_JAVA_PORTS_INSTALLED: ${_JAVA_PORTS_INSTALLED}."
>+	@echo "_JAVA_PORTS_POSSIBLE: ${_JAVA_PORTS_POSSIBLE}."
>+	@echo "_JAVA_PORTS_INSTALLED_POSSIBLE: ${_JAVA_PORTS_INSTALLED_POSSIBLE}."
>+	@echo "_JAVA_PORTS_POSSIBLE: ${_JAVA_PORTS_POSSIBLE}."
>+	@echo "A_JAVA_PORT_INSTALLED_POSSIBLE: ${A_JAVA_PORT_INSTALLED_POSSIBLE}."
>+	@echo "__JAVA_PORTS_INSTALLED_POSSIBLE: ${__JAVA_PORTS_INSTALLED_POSSIBLE}."
>+	@echo "_JAVA_PORTS_INSTALLED_POSSIBLE: ${_JAVA_PORTS_INSTALLED_POSSIBLE}."
>+	@echo "_JAVA_PORTS_INSTALLED_POSSIBLE: ${_JAVA_PORTS_INSTALLED_POSSIBLE}."
>+	@echo "_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit: ${_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit}."
>+	@echo "_JAVA_PORTS_POSSIBLE: ${_JAVA_PORTS_POSSIBLE}."
>+	@echo "_JAVA_PORTS_POSSIBLE_shortcircuit: ${_JAVA_PORTS_POSSIBLE_shortcircuit}."
>+	@echo "_JAVA_PORT: ${_JAVA_PORT}."
>+	@echo "_JAVA_PORTS_POSSIBLE_shortcircuit: ${_JAVA_PORTS_POSSIBLE_shortcircuit}."
>+	@echo "_JAVA_PORT_INFO: ${_JAVA_PORT_INFO}."
>+	@echo "JAVA_PORT: ${JAVA_PORT}."
>+	@echo "JAVA_HOME: ${JAVA_HOME}."
>+	@echo "JAVA_PORT_VERSION: ${JAVA_PORT_VERSION}."
>+	@echo "JAVA_PORT_OS: ${JAVA_PORT_OS}."
>+	@echo "JAVA_PORT_VENDOR: ${JAVA_PORT_VENDOR}."
>+	@echo "JAVA_PORT_VENDOR_DESCRIPTION: ${JAVA_PORT_VENDOR_DESCRIPTION}."
>+	@echo "JAVA_PORT_OS_DESCRIPTION: ${JAVA_PORT_OS_DESCRIPTION}."
>Index: smstools3/Makefile
>===================================================================
>--- smstools3/Makefile	(revision 307414)
>+++ smstools3/Makefile	(working copy)
>@@ -45,7 +45,7 @@
> 
> .if ${PORT_OPTIONS:MSTATS}
> LIB_DEPENDS+=	mm.14:${PORTSDIR}/devel/mm
>-CFLAGS+=	-I${LOCALBASE}/include
>+CFLAGS+=	`mm-config --cflags`
> .else
> CFLAGS+=	-DNOSTATS
> .endif
>Index: smstools3/files/patch-src-Makefile
>===================================================================
>--- smstools3/files/patch-src-Makefile	(revision 307414)
>+++ smstools3/files/patch-src-Makefile	(working copy)
>@@ -18,12 +18,3 @@
>  
>  # Comment this out if iconv is not available on the system
>  #CFLAGS += -D USE_ICONV
>-@@ -50,7 +50,7 @@
>- ifneq (,$(findstring NOSTATS,$(CFLAGS)))
>- 	$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS)
>- else 
>--	$(CC) `mm-config --cflags` $(CFLAGS) -o $@ $^ `mm-config --ldflags --libs` $(LFLAGS)
>-+	$(CC) `$(LOCALBASE)/bin/mm-config --cflags` $(CFLAGS) -o $@ $^ `$(LOCALBASE)/bin/mm-config --ldflags --libs` $(LFLAGS)
>- endif
>- 
>- clean:

Actions: View | Diff

Attachments on bug 219050: 182285 | 182286