- Fix plist when build with DEBUG option

3 files changed, 49 insertions, 17 deletions

diff --git a/lang/python38/Makefile b/lang/python38/Makefile
index 5efe65933c01..825d2876f164 100644
--- a/lang/python38/Makefile
+++ b/lang/python38/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
@@ -92,7 +93,8 @@ ABIFLAGS:=	d${ABIFLAGS}
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python${PYTHON_VER}${ABIFLAGS} \
 		bin/python${PYTHON_VER}${ABIFLAGS}-config \
-		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc
+		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc \
+		libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc
 .endif
 
 # https://bugs.python.org/issue22521
diff --git a/lang/python38/files/patch-Makefile.pre.in b/lang/python38/files/patch-Makefile.pre.in
index 0b76edfdcbe9..1262d9f1aea6 100644
--- a/lang/python38/files/patch-Makefile.pre.in
+++ b/lang/python38/files/patch-Makefile.pre.in
@@ -1,7 +1,7 @@
 # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_*
 # Submitted by: koobs (r326729)
 # TODO: Upstream
---- Makefile.pre.in.orig	2019-10-19 23:59:05 UTC
+--- Makefile.pre.in.orig	2019-11-04 01:16:37 UTC
 +++ Makefile.pre.in
 @@ -80,7 +80,6 @@ MAKESETUP=      $(srcdir)/Modules/makesetup
  OPT=		@OPT@
@@ -33,3 +33,33 @@
  PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  SGI_ABI=	@SGI_ABI@
+@@ -1269,14 +1266,6 @@ bininstall: altbininstall
+ 	else true; \
+ 	fi
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
+-	-if test "$(VERSION)" != "$(LDVERSION)"; then \
+-		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
+-		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
+-		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
+-		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
+-		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
+-		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
+-	fi
+ 	-rm -f $(DESTDIR)$(BINDIR)/python3-config
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
+ 	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
+@@ -1580,6 +1569,14 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+ 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ 	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
+ 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
++	-if test "$(VERSION)" != "$(LDVERSION)"; then \
++		rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
++		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
++		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
++		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
++		rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
++		(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
++	fi
+ 	@if [ -s Modules/python.exp -a \
+ 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+ 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
diff --git a/lang/python38/pkg-plist b/lang/python38/pkg-plist
index b253b3199802..3593a94ab6fa 100644
--- a/lang/python38/pkg-plist
+++ b/lang/python38/pkg-plist
@@ -22,21 +22,21 @@ include/python%%XYDOT%%%%ABI%%/codecs.h
 include/python%%XYDOT%%%%ABI%%/compile.h
 include/python%%XYDOT%%%%ABI%%/complexobject.h
 include/python%%XYDOT%%%%ABI%%/context.h
-include/python%%XYDOT%%/cpython/abstract.h
-include/python%%XYDOT%%/cpython/dictobject.h
-include/python%%XYDOT%%/cpython/fileobject.h
-include/python%%XYDOT%%/cpython/initconfig.h
-include/python%%XYDOT%%/cpython/interpreteridobject.h
-include/python%%XYDOT%%/cpython/object.h
-include/python%%XYDOT%%/cpython/objimpl.h
-include/python%%XYDOT%%/cpython/pyerrors.h
-include/python%%XYDOT%%/cpython/pylifecycle.h
-include/python%%XYDOT%%/cpython/pymem.h
-include/python%%XYDOT%%/cpython/pystate.h
-include/python%%XYDOT%%/cpython/sysmodule.h
-include/python%%XYDOT%%/cpython/traceback.h
-include/python%%XYDOT%%/cpython/tupleobject.h
-include/python%%XYDOT%%/cpython/unicodeobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/abstract.h
+include/python%%XYDOT%%%%ABI%%/cpython/dictobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/fileobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/initconfig.h
+include/python%%XYDOT%%%%ABI%%/cpython/interpreteridobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/object.h
+include/python%%XYDOT%%%%ABI%%/cpython/objimpl.h
+include/python%%XYDOT%%%%ABI%%/cpython/pyerrors.h
+include/python%%XYDOT%%%%ABI%%/cpython/pylifecycle.h
+include/python%%XYDOT%%%%ABI%%/cpython/pymem.h
+include/python%%XYDOT%%%%ABI%%/cpython/pystate.h
+include/python%%XYDOT%%%%ABI%%/cpython/sysmodule.h
+include/python%%XYDOT%%%%ABI%%/cpython/traceback.h
+include/python%%XYDOT%%%%ABI%%/cpython/tupleobject.h
+include/python%%XYDOT%%%%ABI%%/cpython/unicodeobject.h
 include/python%%XYDOT%%%%ABI%%/datetime.h
 include/python%%XYDOT%%%%ABI%%/descrobject.h
 include/python%%XYDOT%%%%ABI%%/dictobject.h