Hi,
this diff takes into account the new xfce archive layout for distfiles,
it's needed for further updates (see
http://foo-projects.org/pipermail/xfce/2009-July/025657.html for the
details if you care)
xfce4.port.mk now distinguishes core components, goodies apps, artwork,
panel plugins and thunar plugins. Some ports went from core to goodie,
and some goodies went to thunar-plugins category. xfprint and
notification-daemon-xfce were moved to archive.
the packages where HOMEPAGE changed due to the module change have been
bumped. No bump is needed where only MASTER_SITES changed.
Please proofread & comment - i'm running a check with PLIST_DB and this
diff. I'll take care of adding xcb wantlib in a second time.
Landry
? p5-xfce4
? thunar-svn
? thunar-vcs
? xfce4-artwork
? xfce4-dev-tools
? xfce4-linelight
? xfce4-xfapplet
Index: xfce4.port.mk
===================================================================
RCS file: /cvs/ports/x11/xfce4/xfce4.port.mk,v
retrieving revision 1.6
diff -u -r1.6 xfce4.port.mk
--- xfce4.port.mk 28 Apr 2009 19:37:29 -0000 1.6
+++ xfce4.port.mk 8 Aug 2009 10:24:21 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: xfce4.port.mk,v 1.6 2009/04/28 19:37:29 landry Exp $
-# Module for Xfce related ports, divided into three categories:
-# core, goodies, plugins.
+# Module for Xfce related ports, divided into five categories:
+# core, goodie, artwork, thunar plugins, panel plugins.
XFCE_DESKTOP_VERSION= 4.6.1
CATEGORIES+= x11/xfce4
@@ -20,6 +20,8 @@
XFCE_VERSION= ${XFCE_DESKTOP_VERSION}
.endif
+XFCE_BRANCH= ${XFCE_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
# Set to 'yes' if there are .desktop files in the package list.
.if defined(DESKTOP_FILES) && ${DESKTOP_FILES:L} == "yes"
MODXFCE_RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils
@@ -28,7 +30,7 @@
.if defined(XFCE_PLUGIN)
HOMEPAGE?=
http://goodies.xfce.org/projects/panel-plugins/xfce4-${XFCE_PLUGIN}-plugin
-MASTER_SITES?= http://goodies.xfce.org/releases/xfce4-${XFCE_PLUGIN}-plugin/
+MASTER_SITES?=
http://archive.xfce.org/src/panel-plugins/xfce4-${XFCE_PLUGIN}-plugin/${XFCE_BRANCH}/
DISTNAME?= xfce4-${XFCE_PLUGIN}-plugin-${XFCE_VERSION}
PKGNAME?= ${DISTNAME:S/-plugin//}
@@ -36,12 +38,23 @@
.elif defined(XFCE_GOODIE)
HOMEPAGE?= http://goodies.xfce.org/projects/applications/${XFCE_GOODIE}
-MASTER_SITES?= http://goodies.xfce.org/releases/${XFCE_GOODIE}/
+MASTER_SITES?=
http://archive.xfce.org/src/apps/${XFCE_GOODIE:L}/${XFCE_BRANCH}/
DISTNAME= ${XFCE_GOODIE}-${XFCE_VERSION}
+.elif defined(XFCE_ARTWORK)
+HOMEPAGE?= http://www.xfce.org/projects/
+
+MASTER_SITES?= http://archive.xfce.org/src/art/${XFCE_ARTWORK}/${XFCE_BRANCH}/
+DISTNAME= ${XFCE_ARTWORK}-${XFCE_VERSION}
+.elif defined(THUNAR_PLUGIN)
+HOMEPAGE?= http://goodies.xfce.org/projects/thunar-plugins/${THUNAR_PLUGIN}
+
+MASTER_SITES?=
http://archive.xfce.org/src/thunar-plugins/${THUNAR_PLUGIN}/${XFCE_BRANCH}/
+DISTNAME?= ${THUNAR_PLUGIN}-${XFCE_VERSION}
+PKGNAME?= ${DISTNAME:S/-plugin//}
.elif defined(XFCE_PROJECT)
HOMEPAGE?= http://www.xfce.org/projects/${XFCE_PROJECT}
-MASTER_SITES?= http://www.xfce.org/archive/xfce-${XFCE_DESKTOP_VERSION}/src/
+MASTER_SITES?=
http://archive.xfce.org/src/xfce/${XFCE_PROJECT:L}/${XFCE_BRANCH}/
DISTNAME= ${XFCE_PROJECT}-${XFCE_VERSION}
.endif
Index: mousepad/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/mousepad/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- mousepad/Makefile 28 Apr 2009 19:40:09 -0000 1.10
+++ mousepad/Makefile 8 Aug 2009 10:24:21 -0000
@@ -3,9 +3,10 @@
COMMENT= Xfce4 simple text editor
XFCE_VERSION= 0.2.16
-XFCE_PROJECT= mousepad
+XFCE_GOODIE= mousepad
PKGNAME= ${DISTNAME}p0
+HOMEPAGE= http://www.xfce.org/projects/mousepad
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
Index: notification-daemon-xfce/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/notification-daemon-xfce/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- notification-daemon-xfce/Makefile 3 May 2009 19:43:36 -0000 1.10
+++ notification-daemon-xfce/Makefile 8 Aug 2009 10:24:21 -0000
@@ -6,6 +6,7 @@
XFCE_GOODIE= notification-daemon-xfce
PKGNAME= ${DISTNAME}p6
+MASTER_SITES=
http://archive.xfce.org/src/archive/${XFCE_GOODIE}/${XFCE_BRANCH}/
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
Index: orage/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/orage/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- orage/Makefile 28 Apr 2009 19:44:29 -0000 1.14
+++ orage/Makefile 8 Aug 2009 10:24:21 -0000
@@ -2,8 +2,9 @@
COMMENT= Xfce4 advanced calendar
-XFCE_PROJECT= orage
+XFCE_GOODIE= orage
+HOMEPAGE= http://www.xfce.org/projects/orage
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
Index: terminal/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/terminal/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- terminal/Makefile 27 Jul 2009 19:58:10 -0000 1.13
+++ terminal/Makefile 8 Aug 2009 10:24:21 -0000
@@ -6,7 +6,6 @@
XFCE_GOODIE= Terminal
# :L is here for a reason
PKGNAME= ${DISTNAME:L}
-MASTER_SITES= http://goodies.xfce.org/releases/${XFCE_GOODIE:L}/
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
Index: thunar-archive/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/thunar-archive/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- thunar-archive/Makefile 22 Jul 2009 20:43:43 -0000 1.1.1.1
+++ thunar-archive/Makefile 8 Aug 2009 10:24:21 -0000
@@ -3,9 +3,8 @@
COMMENT = Thunar archive plugin
XFCE_VERSION = 0.2.4
-XFCE_GOODIE = thunar-archive-plugin
-PKGNAME = ${DISTNAME:S/-plugin//}
-MASTER_SITES = ${MASTER_SITE_BERLIOS:=xfce-goodies/}
+THUNAR_PLUGIN = thunar-archive-plugin
+PKGNAME = ${DISTNAME:S/-plugin//}p0
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
Index: thunar-media-tags/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/thunar-media-tags/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- thunar-media-tags/Makefile 23 Jun 2009 19:53:03 -0000 1.7
+++ thunar-media-tags/Makefile 8 Aug 2009 10:24:21 -0000
@@ -3,8 +3,8 @@
COMMENT= Thunar media tags plugin
XFCE_VERSION= 0.1.2
-XFCE_GOODIE= thunar-media-tags-plugin
-PKGNAME= ${DISTNAME:S/-plugin//}p5
+THUNAR_PLUGIN= thunar-media-tags-plugin
+PKGNAME= ${DISTNAME:S/-plugin//}p6
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
Index: thunar-thumbnailers/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/thunar-thumbnailers/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- thunar-thumbnailers/Makefile 23 Jun 2009 20:14:28 -0000 1.5
+++ thunar-thumbnailers/Makefile 8 Aug 2009 10:24:21 -0000
@@ -3,8 +3,8 @@
COMMENT= Thunar additional thumbnailers plugin
XFCE_VERSION= 0.3.2
-XFCE_GOODIE= thunar-thumbnailers
-PKGNAME= ${DISTNAME}p1
+THUNAR_PLUGIN= thunar-thumbnailers
+PKGNAME= ${DISTNAME}p2
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
Index: xfce4-icon-theme/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/xfce4-icon-theme/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- xfce4-icon-theme/Makefile 23 Jun 2009 20:14:28 -0000 1.18
+++ xfce4-icon-theme/Makefile 8 Aug 2009 10:24:21 -0000
@@ -3,12 +3,9 @@
COMMENT= Xfce4 icon theme
-XFCE_PROJECT= xfce4-icon-theme
+XFCE_ARTWORK= xfce4-icon-theme
XFCE_VERSION= 4.4.3
PKGNAME= ${DISTNAME}p2
-
-HOMEPAGE= http://www.xfce.org/projects
-MASTER_SITES= http://www.xfce.org/archive/xfce-${XFCE_VERSION}/src/
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
Index: xfce4-mixer/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/xfce4-mixer/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- xfce4-mixer/Makefile 28 Apr 2009 19:48:47 -0000 1.16
+++ xfce4-mixer/Makefile 8 Aug 2009 10:24:21 -0000
@@ -2,7 +2,8 @@
COMMENT= Xfce4 volume mixer
-XFCE_PROJECT= xfce4-mixer
+XFCE_GOODIE= xfce4-mixer
+HOMEPAGE= http://www.xfce.org/projects/xfce4-mixer
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
Index: xfce4-verve/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/xfce4-verve/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- xfce4-verve/Makefile 23 Jun 2009 20:18:18 -0000 1.8
+++ xfce4-verve/Makefile 8 Aug 2009 10:24:21 -0000
@@ -5,17 +5,13 @@
XFCE_VERSION= 0.3.5
XFCE_PLUGIN= verve
DISTNAME= ${XFCE_PLUGIN}-plugin-${XFCE_VERSION}
-PKGNAME= xfce4-${XFCE_PLUGIN}-${XFCE_VERSION}p4
-
-HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/verve-plugin
+PKGNAME= xfce4-${XFCE_PLUGIN}-${XFCE_VERSION}p5
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
-
-MASTER_SITES= http://goodies.xfce.org/releases/verve-plugin/
MODULES= x11/xfce4
Index: xfprint/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/xfprint/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- xfprint/Makefile 22 May 2009 13:08:22 -0000 1.11
+++ xfprint/Makefile 8 Aug 2009 10:24:21 -0000
@@ -5,6 +5,7 @@
XFCE_PROJECT= xfprint
PKGNAME= ${DISTNAME}p0
+MASTER_SITES=
http://archive.xfce.org/src/archive/${XFCE_PROJECT}/${XFCE_BRANCH}/
SHARED_LIBS= xfprint 0.1
# GPLv2
Index: xfwm4-themes/Makefile
===================================================================
RCS file: /cvs/ports/x11/xfce4/xfwm4-themes/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- xfwm4-themes/Makefile 28 Apr 2009 19:40:10 -0000 1.12
+++ xfwm4-themes/Makefile 8 Aug 2009 10:24:21 -0000
@@ -3,11 +3,9 @@
COMMENT= Xfwm4 window decoration themes
-XFCE_PROJECT= xfwm4-themes
+XFCE_ARTWORK= xfwm4-themes
XFCE_VERSION= 4.6.0
PKGNAME= ${DISTNAME}p0
-
-HOMEPAGE= http://www.xfce.org/projects/
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
