ports/64877: [Update Port] x11-themes/gnome-icons*: Fix Makefiles per PR 64393

Tom McLaughlin tmclaugh at sdf.lonestar.org
Mon Mar 29 03:40:04 UTC 2004 

>Number:         64877
>Category:       ports
>Synopsis:       [Update Port] x11-themes/gnome-icons*: Fix Makefiles per PR 64393
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 28 19:40:04 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Tom McLaughlin
>Release:        FreeBSD 4.9-RELEASE-p4 i386
>Organization:
>Environment:


System: FreeBSD 4.9-RELEASE-p4 #0: Wed Mar 17 21:16:53 EST 2004
    root at compass.straycat.dhs.org:/usr/obj/usr/src/sys/COMPASS



>Description:


In PR 64393 the x11-themes/gnome-icons-* ports were noted as having 
the following problem:

The last line of a non-slave ports Makefile must be one of:
include <bsd.port.mk>
include <bsd.port.post.mk>


Attached patch fixes this problem in the following ports:
x11-themes/gnome-icons-aqua-fusion
x11-themes/gnome-icons-cool-gorilla
x11-themes/gnome-icons-crystal
x11-themes/gnome-icons-gentoo-test
x11-themes/gnome-icons-iris
x11-themes/gnome-icons-noia-full
x11-themes/gnome-icons-noia-warm
x11-themes/gnome-icons-refined
x11-themes/gnome-icons-slick
x11-themes/gnome-icons-snow-apple
x11-themes/gnome-icons-stylish
x11-themes/gnome-icons-ximian-south

The patch also renames Makefile.icons to bsd.gome-icons.mk in
x11-themes/gnome-icons to make it apparent to everyone that it is used
like the bsd.*.mk files in /usr/ports/Mk.


>How-To-Repeat:





>Fix:


--- x11-themes_gnome-icons.diff begins here ---
diff -Nur x11-themes.orig/gnome-icons/Makefile.icons x11-themes/gnome-icons/Makefile.icons
--- x11-themes.orig/gnome-icons/Makefile.icons	Thu Mar  4 14:32:17 2004
+++ x11-themes/gnome-icons/Makefile.icons	Wed Dec 31 19:00:00 1969
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	Gnome iconset
-# Date created:				29 Feb 2004
-# Whom:					Tom McLaughlin <tmclaugh at sdf.lonestar.org>
-#
-# $FreeBSD: ports/x11-themes/gnome-icons/Makefile.icons,v 1.1 2004/03/04 19:32:17 pav Exp $
-#
-
-# Port logic gratuitously stolen from x11-themes/kde-icons-noia by
-# lioux at .
-
-PKGNAMEPREFIX=	gnome-icons-
-MASTER_SITES?=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR?=	teams/art.gnome.org/themes/icon
-
-NO_BUILD=	yes
-USE_SIZE=	yes
-
-REASON=		Themes may contain artwork not done by the author. \
-		Keep FreeBSD safe if theme author violated copyrights.
-
-USE_X_PREFIX=	yes
-
-do-install:
-	${MKDIR} ${PREFIX}/share/icons/${PORTNAME}
-	cd ${WRKSRC} && ${FIND} . -type d ! -empty \
-		-exec ${MKDIR} -m 0755 \
-		${PREFIX}/share/icons/${PORTNAME}/"{}" \;
-	cd ${WRKSRC} && ${FIND} . -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/"{}" \
-		${PREFIX}/share/icons/${PORTNAME}/"{}" \;
-
-.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons/bsd.gome-icons.mk x11-themes/gnome-icons/bsd.gome-icons.mk
--- x11-themes.orig/gnome-icons/bsd.gome-icons.mk	Wed Dec 31 19:00:00 1969
+++ x11-themes/gnome-icons/bsd.gome-icons.mk	Sun Mar 28 21:13:47 2004
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	Gnome iconset
+# Date created:				29 Feb 2004
+# Whom:					Tom McLaughlin <tmclaugh at sdf.lonestar.org>
+#
+# $FreeBSD: ports/x11-themes/gnome-icons/Makefile.icons,v 1.1 2004/03/04 19:32:17 pav Exp $
+#
+
+# Port logic gratuitously stolen from x11-themes/kde-icons-noia by
+# lioux at .
+
+PKGNAMEPREFIX=	gnome-icons-
+MASTER_SITES?=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR?=	teams/art.gnome.org/themes/icon
+
+NO_BUILD=	yes
+USE_SIZE=	yes
+
+REASON=		Themes may contain artwork not done by the author. \
+		Keep FreeBSD safe if theme author violated copyrights.
+
+USE_X_PREFIX=	yes
+
+do-install:
+	${MKDIR} ${PREFIX}/share/icons/${PORTNAME}
+	cd ${WRKSRC} && ${FIND} . -type d ! -empty \
+		-exec ${MKDIR} -m 0755 \
+		${PREFIX}/share/icons/${PORTNAME}/"{}" \;
+	cd ${WRKSRC} && ${FIND} . -type f \
+		-exec ${INSTALL_DATA} ${WRKSRC}/"{}" \
+		${PREFIX}/share/icons/${PORTNAME}/"{}" \;
diff -Nur x11-themes.orig/gnome-icons-aqua-fusion/Makefile x11-themes/gnome-icons-aqua-fusion/Makefile
--- x11-themes.orig/gnome-icons-aqua-fusion/Makefile	Thu Mar  4 14:34:36 2004
+++ x11-themes/gnome-icons-aqua-fusion/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/AquaFusion"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-cool-gorilla/Makefile x11-themes/gnome-icons-cool-gorilla/Makefile
--- x11-themes.orig/gnome-icons-cool-gorilla/Makefile	Thu Mar  4 14:39:28 2004
+++ x11-themes/gnome-icons-cool-gorilla/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/CoolGorilla-ICONS"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-crystal/Makefile x11-themes/gnome-icons-crystal/Makefile
--- x11-themes.orig/gnome-icons-crystal/Makefile	Thu Mar  4 15:01:48 2004
+++ x11-themes/gnome-icons-crystal/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-gentoo-test/Makefile x11-themes/gnome-icons-gentoo-test/Makefile
--- x11-themes.orig/gnome-icons-gentoo-test/Makefile	Thu Mar  4 15:09:17 2004
+++ x11-themes/gnome-icons-gentoo-test/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Gentoo-test"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-iris/Makefile x11-themes/gnome-icons-iris/Makefile
--- x11-themes.orig/gnome-icons-iris/Makefile	Thu Mar  4 15:14:38 2004
+++ x11-themes/gnome-icons-iris/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Iris"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-noia-full/Makefile x11-themes/gnome-icons-noia-full/Makefile
--- x11-themes.orig/gnome-icons-noia-full/Makefile	Thu Mar  4 15:31:18 2004
+++ x11-themes/gnome-icons-noia-full/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Noia"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-noia-warm/Makefile x11-themes/gnome-icons-noia-warm/Makefile
--- x11-themes.orig/gnome-icons-noia-warm/Makefile	Thu Mar  4 15:39:17 2004
+++ x11-themes/gnome-icons-noia-warm/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/NoiaWarm"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-refined/Makefile x11-themes/gnome-icons-refined/Makefile
--- x11-themes.orig/gnome-icons-refined/Makefile	Thu Mar  4 15:46:40 2004
+++ x11-themes/gnome-icons-refined/Makefile	Sun Mar 28 21:13:47 2004
@@ -23,4 +23,5 @@
 
 WRKSRC=		"${WRKDIR}/gnome-rh8"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-slick/Makefile x11-themes/gnome-icons-slick/Makefile
--- x11-themes.orig/gnome-icons-slick/Makefile	Thu Mar  4 15:51:47 2004
+++ x11-themes/gnome-icons-slick/Makefile	Sun Mar 28 21:13:47 2004
@@ -24,4 +24,5 @@
 USE_BZIP2=	yes
 WRKSRC=		"${WRKDIR}/Slick"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-snow-apple/Makefile x11-themes/gnome-icons-snow-apple/Makefile
--- x11-themes.orig/gnome-icons-snow-apple/Makefile	Thu Mar  4 15:55:47 2004
+++ x11-themes/gnome-icons-snow-apple/Makefile	Sun Mar 28 21:13:47 2004
@@ -23,4 +23,5 @@
 
 WRKSRC=		"${WRKDIR}/Snow-Apple"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-stylish/Makefile x11-themes/gnome-icons-stylish/Makefile
--- x11-themes.orig/gnome-icons-stylish/Makefile	Thu Mar  4 15:58:29 2004
+++ x11-themes/gnome-icons-stylish/Makefile	Sun Mar 28 21:13:47 2004
@@ -23,4 +23,5 @@
 
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
diff -Nur x11-themes.orig/gnome-icons-ximian-south/Makefile x11-themes/gnome-icons-ximian-south/Makefile
--- x11-themes.orig/gnome-icons-ximian-south/Makefile	Thu Mar  4 16:02:42 2004
+++ x11-themes/gnome-icons-ximian-south/Makefile	Sun Mar 28 21:13:47 2004
@@ -23,4 +23,5 @@
 
 WRKSRC=		"${WRKDIR}/${PORTNAME}"
 
-.include "${.CURDIR}/../gnome-icons/Makefile.icons"
+.include "${.CURDIR}/../gnome-icons/bsd.gome-icons.mk"
+.include <bsd.port.mk>
--- x11-themes_gnome-icons.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list