SF.net SVN: gar:[23059] csw/mgar/pkg/apache2/branches/apache24/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 23059
          http://sourceforge.net/p/gar/code/23059
Author:   dmichelsen
Date:     2014-02-21 15:59:04 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
apache2/branches/apache24: Add override and reorder to standard

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-21 10:30:12 UTC (rev 23058)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2014-02-21 15:59:04 UTC (rev 23059)
@@ -13,18 +13,16 @@
   best around in terms of functionality, efficiency, security and speed.
 endef
 
-# Source location
 MASTER_SITES  = http://www.eu.apache.org/dist/httpd/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswapache24
 
-# work around dumb checkpkg not recognizing the license file ...
+PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
+PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
+
+VENDOR_URL = http://httpd.apache.org/
 LICENSE = LICENSE
 
-# Visitor information
-SPKG_SOURCEURL = http://httpd.apache.org/
-
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += cswapache24
-
 PACKAGES = CSWapache24
 SPKG_DESC_CSWapache24 = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2
@@ -48,8 +46,8 @@
 SPKG_DESC_CSWapache24-dev = The Apache 2.4 Development Files
 PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL)
 
-PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
-PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
+# This is a fallback
+CHECKPKG_OVERRIDES_CSWapache24-dev += file-with-bad-content|/usr/local|root/opt/csw/include/apache2/httpd.h
 
 BUILD_DEP_PKGS += CSWlibaprutil-dev
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.