summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/cjs/Makefile1
-rw-r--r--lang/python27/Makefile4
-rw-r--r--lang/python33/Makefile4
-rw-r--r--lang/python34/Makefile4
-rw-r--r--lang/python35/Makefile4
-rw-r--r--lang/qore/Makefile1
-rw-r--r--lang/smalltalk/Makefile4
7 files changed, 9 insertions, 13 deletions
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index c31c7f170b23..47c346b54413 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -21,7 +21,6 @@ USE_GNOME= cairo glib20 gnomeprefix introspection:build
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
USE_LDCONFIG= yes
-PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 76fa9e6ca380..b6319cd338f6 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -12,7 +12,8 @@ COMMENT= Interpreted object-oriented programming language
LICENSE= PSFL
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -28,7 +29,6 @@ TEST_TARGET= buildbottest
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
PLIST_SUB= ABI=${ABIFLAGS} \
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 09e03844e866..0ad15145f8ca 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -16,7 +16,8 @@ LICENSE= PSFL
DEPRECATED= No longer receives bug fixes, only security updates. Please update to Python 3.5
EXPIRATION_DATE= 2017-09-01
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -28,7 +29,6 @@ CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove o
INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
TEST_TARGET= buildbottest
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index e883505247f6..aeafd9d96133 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -13,7 +13,8 @@ COMMENT= Interpreted object-oriented programming language
LICENSE= PSFL
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -30,7 +31,6 @@ TEST_TARGET= buildbottest
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
SUB_FILES= pkg-message
diff --git a/lang/python35/Makefile b/lang/python35/Makefile
index dac754e6affd..9570c55b270f 100644
--- a/lang/python35/Makefile
+++ b/lang/python35/Makefile
@@ -14,7 +14,8 @@ COMMENT= Interpreted object-oriented programming language
LICENSE= PSFL
-USES= cpe ncurses pkgconfig readline ssl tar:xz
+USES= cpe ncurses pathfix pkgconfig readline ssl tar:xz
+PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -37,7 +38,6 @@ TEST_TARGET= buildbottest
TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER}
MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library
-MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in
MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
SUB_FILES= pkg-message
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index cef5a3c5fc60..e46d6b299e39 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -42,6 +42,5 @@ pre-configure:
post-configure:
${REINPLACE_CMD} -e 's|; make|; $${MAKE}|g' ${WRKSRC}/Makefile.in
- ${REINPLACE_CMD} -e 's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#g' ${WRKSRC}/Makefile.in
.include <bsd.port.post.mk>
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index cdd007cffbe0..1364dd84f131 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -23,7 +23,7 @@ TK_CONFIGURE_WITH=tcl=${LOCALBASE}/lib/tcl8.4 tk=${LOCALBASE}/lib/tk8.4
PGSQL_USES= pgsql
SDL_USE= SDL=image,mixer,sdl,sound,ttf
-USES= execinfo gmake iconv libtool localbase makeinfo pkgconfig \
+USES= execinfo gmake iconv libtool localbase makeinfo pathfix pkgconfig \
shebangfix sqlite tar:xz
USE_GNOME= pango
USE_XORG= ice xi xmu
@@ -57,8 +57,6 @@ post-patch:
${WRKSRC}/libgst/prims.inl
@${REINPLACE_CMD} -e '/^ac_include/s/\\$$/#include <wctype.h> \\/' \
${WRKSRC}/snprintfv/configure
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
post-build:
@${SED} -e 's|@bindir@|${PREFIX}/bin|g' \