[oe-commits] org.oe.dev gallery: introduce SOURCE_FORGEMIRROR variable and replace hardcoded paths with variables. Closes 2450.

[Laibsch commit]

gallery: introduce SOURCE_FORGEMIRROR variable and replace hardcoded paths with variables.  Closes 2450.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 3290f95e113d0da965ed4791ceb9de80bb2b03bd
ViewMTN: http://monotone.openembedded.org/revision/info/3290f95e113d0da965ed4791ceb9de80bb2b03bd
Files:
1
packages/gallery/gallery_1.5.5.bb
Diffs:

#
# mt diff -rc0c308f580f1d53842f1ffe4e9677c8dd631e6b5 -r3290f95e113d0da965ed4791ceb9de80bb2b03bd
#
#
#
# patch "packages/gallery/gallery_1.5.5.bb"
#  from [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#    to [511bfe0c06f90814e496d4f7e1d3b7218cd60e28]
#
============================================================
--- packages/gallery/gallery_1.5.5.bb	733e15213ab5e6ec1bd791438af67af63d5ec35c
+++ packages/gallery/gallery_1.5.5.bb	511bfe0c06f90814e496d4f7e1d3b7218cd60e28
@@ -2,21 +2,21 @@ RDEPENDS = "apache2 modphp imagemagick j
 SECTION = "apps"
 LICENSE = "GPL"
 RDEPENDS = "apache2 modphp imagemagick jhead"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-pl1.tar.gz"
+SRC_URI = "http://{SOURCEFORGE_MIRROR}/sourceforge/gallery/gallery-${PV}-pl1.tar.gz"
 
 S = "${WORKDIR}/gallery"
 
 inherit autotools
 
-HTTPCONF = "/etc/apache2/httpd.conf"
-DEST_DIR = "/usr/share/apache2/htdocs/"
+HTTPCONF = "${sysconfdir}/apache2/httpd.conf"
+DEST_DIR = "${datadir}/apache2/htdocs/"
 
 #
 # don't list the albums as a file - it might get auto-deleted
 #
-FILES_${PN} = "${DEST_DIR}/gallery /etc/apache2/modules.d"
+FILES_${PN} = "${DEST_DIR}/gallery ${sysconfdir}/apache2/modules.d"
 
 
 # No configure step for gallery
@@ -31,12 +31,12 @@ do_install() {
 
 #
 do_install() {
-	mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d
+	mkdir -p ${D}/${DEST_DIR} ${D}${sysconfdir}/apache2/modules.d
 	cp -pPR ${S} ${D}/${DEST_DIR}
-	cp ${FILESDIR}/gallery.conf  ${D}/etc/apache2/modules.d/95_gallery.conf
+	cp ${FILESDIR}/gallery.conf  ${D}${sysconfdir}/apache2/modules.d/95_gallery.conf
 }
 
 # remove the gallery code, but not the albums!
 pkg_postrm_${PN}() {
-	rm -rf ${DEST_DIR}/gallery /etc/apache2/modules.d/95_gallery.conf
+	rm -rf ${DEST_DIR}/gallery /${sysconfdir}/apache2/modules.d/95_gallery.conf
 }