- Respect rule that Makefiles should end with .include <bsd.port.mk>

PR:		ports/64877
Submitted by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org> (maintainer)

14 files changed, 37 insertions, 27 deletions

diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile
index 5e850a8ba596..dd546d862309 100644
--- a/x11-themes/gnome-icons-aqua-fusion/Makefile
+++ b/x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	aqua-fusion
 PORTVERSION=	20030216
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/AquaFusion"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-cool-gorilla/Makefile b/x11-themes/gnome-icons-cool-gorilla/Makefile
index b6443c39ca0e..eab8ef434d3b 100644
--- a/x11-themes/gnome-icons-cool-gorilla/Makefile
+++ b/x11-themes/gnome-icons-cool-gorilla/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	cool-gorilla
 PORTVERSION=	20030726
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/CoolGorilla-ICONS"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-crystal/Makefile b/x11-themes/gnome-icons-crystal/Makefile
index 3c12176edf15..7a3c9baa3d1f 100644
--- a/x11-themes/gnome-icons-crystal/Makefile
+++ b/x11-themes/gnome-icons-crystal/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	crystal
 PORTVERSION=	1.0
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile
index 33920bc96bb1..65ba9377317e 100644
--- a/x11-themes/gnome-icons-gentoo-test/Makefile
+++ b/x11-themes/gnome-icons-gentoo-test/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	gentoo-test
 PORTVERSION=	0.1
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Gentoo-test"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile
index e14bc28c13fc..276eb2feecc7 100644
--- a/x11-themes/gnome-icons-iris/Makefile
+++ b/x11-themes/gnome-icons-iris/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	iris
 PORTVERSION=	0.4
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Iris"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-noia-full/Makefile b/x11-themes/gnome-icons-noia-full/Makefile
index 539260084d97..7f075cd83a68 100644
--- a/x11-themes/gnome-icons-noia-full/Makefile
+++ b/x11-themes/gnome-icons-noia-full/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	noia-full
 PORTVERSION=	0.95
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Noia"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile
index f1745fef3ec9..eac26a609477 100644
--- a/x11-themes/gnome-icons-noia-warm/Makefile
+++ b/x11-themes/gnome-icons-noia-warm/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	noia-warm
 PORTVERSION=	0.95
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/NoiaWarm"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile
index c1879fd1a988..e690668b9385 100644
--- a/x11-themes/gnome-icons-refined/Makefile
+++ b/x11-themes/gnome-icons-refined/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	refined
 PORTVERSION=	20030203
@@ -23,4 +23,5 @@ RESTRICTED=	${REASON}
 
 WRKSRC=		"${WRKDIR}/gnome-rh8"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile
index 020b351d40b7..a9bffd84c83b 100644
--- a/x11-themes/gnome-icons-slick/Makefile
+++ b/x11-themes/gnome-icons-slick/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	slick
 PORTVERSION=	20030209
@@ -24,4 +24,5 @@ RESTRICTED=	${REASON}
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Slick"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile
index d7fa45351f41..58104fb6e5ca 100644
--- a/x11-themes/gnome-icons-snow-apple/Makefile
+++ b/x11-themes/gnome-icons-snow-apple/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	snow-apple
 PORTVERSION=	20030202
@@ -23,4 +23,5 @@ RESTRICTED=	${REASON}
 
 WRKSRC=		"${WRKDIR}/Snow-Apple"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile
index 0b603d0238ec..43708aa758c6 100644
--- a/x11-themes/gnome-icons-stylish/Makefile
+++ b/x11-themes/gnome-icons-stylish/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	stylish
 PORTVERSION=	20030129
@@ -23,4 +23,5 @@ RESTRICTED=	${REASON}
 
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile
index ad775f5df60f..ccfd3d0b145b 100644
--- a/x11-themes/gnome-icons-ximian-south/Makefile
+++ b/x11-themes/gnome-icons-ximian-south/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	ximian-south
 PORTVERSION=	1.3.6
@@ -23,4 +23,5 @@ RESTRICTED=	${REASON}
 
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-icons/Makefile b/x11-themes/gnome-icons/Makefile
index 8d441a7eec1b..1056c2d109d0 100644
--- a/x11-themes/gnome-icons/Makefile
+++ b/x11-themes/gnome-icons/Makefile
@@ -7,7 +7,7 @@
 
 # Port logic gratuitously stolen from x11-themes/kde-icons-noia by
 # lioux@.  If it's not defined here and you think it should be, check
-# x11-themes/gnome-icons/Makefile.icons for it.
+# x11-themes/gnome-icons/bsd.gnome-icons.mk for it.
 
 PORTNAME=	gnome-icons
 PORTVERSION=	20040229
diff --git a/x11-themes/gnome-icons/Makefile.icons b/x11-themes/gnome-icons/bsd.gnome-icons.mk
index 29a61c824c38..51ffa0244054 100644
--- a/x11-themes/gnome-icons/Makefile.icons
+++ b/x11-themes/gnome-icons/bsd.gnome-icons.mk
@@ -28,5 +28,3 @@ do-install:
 	cd ${WRKSRC} && ${FIND} . -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/"{}" \
 		${PREFIX}/share/icons/${PORTNAME}/"{}" \;
-
-.include <bsd.port.mk>