Date: Wed, 25 Jul 2007 13:28:37 GMT From: Geoff Glasson <g_glasson@jimali.dyndns.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/114894: PATCH: Support installation of Drupal 5 themes Message-ID: <200707251328.l6PDSb8m050977@www.freebsd.org> Resent-Message-ID: <200707251330.l6PDU3aa093860@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114894
>Category: ports
>Synopsis: PATCH: Support installation of Drupal 5 themes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 25 13:30:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Geoff Glasson
>Release: 6.2-STABLE
>Organization:
>Environment:
FreeBSD gkar.jimali.dyndns.org 6.2-STABLE FreeBSD 6.2-STABLE #10: Sun Jun 3 00:31:01 WST 2007 root@:/usr/obj/usr/src/sys/GENERIC i386
>Description:
I have added support for installing Drupal 5 themes. I have based the additions on the existing module support. Whilst support for Drupal 4 themes is there, I've not tested it.
A patch for bsd.drupal.mk is attached.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- bsd.drupal.mk_orig Wed Jul 25 20:51:35 2007
+++ bsd.drupal.mk Wed Jul 25 21:16:05 2007
@@ -10,11 +10,20 @@
.if defined(DRUPAL4_MODULE) || defined(DRUPAL5_MODULE)
DRUPAL_MODULE?= yes
.else
-.if defined(DRUPAL_MODULE)
+.if defined(DRUPAL_MODULE) && !defined(DRUPAL?_THEME)
DRUPAL4_MODULE= yes
.endif
.endif
+# Make sure DRUPAL_THEME is defined. If no DRUPAL*_theme defined, then define DRUPAL4_THEME
+.if defined(DRUPAL4_THEME) || defined(DRUPAL5_THEME)
+DRUPAL_THEME?= yes
+.else
+.if defined(DRUPAL_THEME)
+DRUPAL4_THEME= yes
+.endif
+.endif
+
# Make sure DRUPAL_PORT is defined. If no DRUPAL*_module defined, then define DRUPAL4_PORT
.if defined(DRUPAL4_PORT) || defined(DRUPAL5_PORT)
DRUPAL_PORT?= yes
@@ -24,11 +33,17 @@
.endif
.endif
-.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT)
+.if defined(DRUPAL5_MODULE) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
DRUPAL_BASE?= www/drupal5
.else
DRUPAL_BASE?= www/drupal4
.endif
+.if defined(DRUPAL5_THEME) || defined(DRUPAL5_PORT) || defined(DRUPAL5_THEME)
+DRUPAL_BASE?= www/drupal5
+.else
+DRUPAL_BASE?= www/drupal4
+.endif
+
DRUPAL_DIR= ${PREFIX}/${DRUPAL_BASE}
DRUPAL_DOCSDIR?= ${PREFIX}/${DRUPAL_BASE}/doc
PLIST_SUB+= DRUPAL_BASE=${DRUPAL_BASE}
@@ -38,7 +53,7 @@
DOCSDIR?= ${DRUPAL_DOCSDIR}
.endif
-.if defined(DRUPAL_MODULE)
+.if defined(DRUPAL_MODULE) || defined(DRUPAL_THEME)
.if defined(DRUPAL4_MODULE)
PKGNAMEPREFIX= drupal4-
@@ -57,6 +72,26 @@
DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${DRUPAL_MODSUBDIR}
.else
DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/modules/${PORTNAME}
+.endif
+.endif
+
+.if defined(DRUPAL4_THEME)
+PKGNAMEPREFIX= drupal4-
+DRUPAL_VERSION?= 4.7.0
+.if defined(DRUPAL_THEMESUBDIR)
+DRUPAL_MODDIR?= ${DRUPAL_BASE}/themes/${DRUPAL_THEMESUBDIR}
+.else
+DRUPAL_MODDIR?= ${DRUPAL_BASE}/themes
+.endif
+.endif
+
+.if defined(DRUPAL5_THEME)
+PKGNAMEPREFIX= drupal5-
+DRUPAL_VERSION?= 5.0
+.if defined(DRUPAL_THEMESUBDIR)
+DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/themes/${DRUPAL_THEMESUBDIR}
+.else
+DRUPAL_MODDIR?= ${DRUPAL_BASE}/sites/all/themes/${PORTNAME}
.endif
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707251328.l6PDSb8m050977>