Use USES=pathfix where applicable.

PR:		213195
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D8093

8 files changed, 1 insertions, 16 deletions

diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 64ebfcfbf55c..2b73905da92b 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -26,7 +26,6 @@ SHEBANG_FILES=	files/usr/bin/cinnamon-desktop-migrate-mediakeys
 python_OLD_CMD=	/usr/bin/python2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index d88f4545aa7f..f8a45da761b8 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -22,7 +22,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 8cce99c12227..d61177433835 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -24,7 +24,6 @@ GH_ACCOUNT=	linuxmint
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
 GNU_CONFIGURE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS=		-I${LOCALBASE}/include -Wno-error=format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index 7e11a130687c..db4b8ab38d8b 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -27,7 +27,6 @@ USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 CONFIGURE_ARGS=	--disable-docbook-docs
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
 CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
index f7f2f1916cac..6f277e5cfa00 100644
--- a/x11/keybinder-gtk3/Makefile
+++ b/x11/keybinder-gtk3/Makefile
@@ -18,7 +18,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	engla
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_GNOME=	gtk30 introspection:build
 USE_XORG=	x11 xext xrender
 GNU_CONFIGURE=	yes
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 94957d611282..fd5ff43f5470 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -17,7 +17,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	engla
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	Makefile.am
 USE_GNOME=	gtk20 introspection:build
 USE_XORG=	x11 xext xrender
 GNU_CONFIGURE=	yes
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 1c143317328b..1ddb60c8eae3 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Session Management library for X11
 
 LICENSE=	MIT
 
+USES=		pathfix
 XORG_CAT=	lib
 USE_XORG=	ice xproto:both xtrans
 
diff --git a/x11/libSM/files/patch-Makefile.am b/x11/libSM/files/patch-Makefile.am
deleted file mode 100644
index 696cf1d60832..000000000000
--- a/x11/libSM/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Makefile.am.orig	2009-02-23 19:42:34.000000000 +0300
-+++ ./Makefile.am	2009-02-23 19:43:19.000000000 +0300
-@@ -1,6 +1,6 @@
- SUBDIRS=src
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = sm.pc
- 
- EXTRA_DIST=sm.pc.in