From 711d76b03274b6741986a7271ec9bbd383f84ba3 Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Wed, 30 Jan 2008 19:19:11 +0000
Subject: [PATCH] - update to 3.4 - fix HOMEPAGE/MASTER_SITES - regen patches -
 run pkg/DESCR through fmt(1)

ok merdely@
---
 www/mod_layout/Makefile               | 10 ++++------
 www/mod_layout/distinfo               | 10 +++++-----
 www/mod_layout/patches/patch-Makefile | 16 ++++++++--------
 www/mod_layout/pkg/DESCR              | 14 +++++++-------
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/www/mod_layout/Makefile b/www/mod_layout/Makefile
index abfaed3d04e..69877f2dd14 100644
--- a/www/mod_layout/Makefile
+++ b/www/mod_layout/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/15 20:38:22 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2008/01/30 19:19:11 okan Exp $
 
 COMMENT=	Apache module for implementing a framework for doing design
 
-DISTNAME=	mod_layout-3.2
-PKGNAME=	${DISTNAME}p2
+DISTNAME=	mod_layout-3.4
 CATEGORIES=	www
 
-HOMEPAGE=	http://software.tangent.org/projects.pl?view=mod_layout
-MASTER_SITES=	http://software.tangent.org/download/ \
-		ftp://ftp.tangent.org/pub/apache/
+HOMEPAGE=	http://tangent.org/
+MASTER_SITES=	http://download.tangent.org/
 MODULES+=	apache-module
 
 # Apache Software License
diff --git a/www/mod_layout/distinfo b/www/mod_layout/distinfo
index 22315b09555..f0e82ac61df 100644
--- a/www/mod_layout/distinfo
+++ b/www/mod_layout/distinfo
@@ -1,5 +1,5 @@
-MD5 (mod_layout-3.2.tar.gz) = /1uIlzl4tqGh1Sd8UsxZ8Q==
-RMD160 (mod_layout-3.2.tar.gz) = V7k0jF37U5XfiPEzvM60awFJ2Iw=
-SHA1 (mod_layout-3.2.tar.gz) = 1j0uNTTndheThNkPPmRjpXV1F4M=
-SHA256 (mod_layout-3.2.tar.gz) = jeV/rITiW/VcmcLA5K7WX9TDL6KjaI6abIda4Tbly0c=
-SIZE (mod_layout-3.2.tar.gz) = 33209
+MD5 (mod_layout-3.4.tar.gz) = K9/ag8bvFefgPCOsQ/MAnQ==
+RMD160 (mod_layout-3.4.tar.gz) = N8VneuaoejPUwYaBkD8Bbc1HzCs=
+SHA1 (mod_layout-3.4.tar.gz) = 6OIC4sxOF9OU0mUdSwUD2/AphVc=
+SHA256 (mod_layout-3.4.tar.gz) = mZc8fsfQJYmQGB39zShxzzNEFz3pDZsF2EAB2XcmB9s=
+SIZE (mod_layout-3.4.tar.gz) = 41454
diff --git a/www/mod_layout/patches/patch-Makefile b/www/mod_layout/patches/patch-Makefile
index 36b5b633a6a..3f8407655c0 100644
--- a/www/mod_layout/patches/patch-Makefile
+++ b/www/mod_layout/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.1 2004/06/13 03:22:34 pvalchev Exp $
---- Makefile.orig	2004-06-12 21:19:59.000000000 -0600
-+++ Makefile	2004-06-12 21:20:06.000000000 -0600
+$OpenBSD: patch-Makefile,v 1.2 2008/01/30 19:19:11 okan Exp $
+--- Makefile.orig	Fri Jan 25 17:41:49 2008
++++ Makefile	Fri Jan 25 17:42:44 2008
 @@ -6,7 +6,7 @@
  APXS=apxs
  APACHECTL=apachectl
- CC=`apxs -q CC`
--INC=-I`apxs -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
-+INC=-I`apxs -q INCLUDEDIR` `$(APXS) -q CFLAGS CFLAGS_SHLIB`  #-DLAYOUT_FILEOWNER_NAME
- LD_SHLIB=`apxs -q LDFLAGS_SHLIB`
- VERSION = 3.2
+ CC=`$(APXS) -q CC`
+-INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
++INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS CFLAGS_SHLIB`  #-DLAYOUT_FILEOWNER_NAME
+ LD_SHLIB=`$(APXS) -q LDFLAGS_SHLIB`
+ VERSION = 3.4
  DISTNAME = mod_layout
diff --git a/www/mod_layout/pkg/DESCR b/www/mod_layout/pkg/DESCR
index 194587dc62e..26e013ff935 100644
--- a/www/mod_layout/pkg/DESCR
+++ b/www/mod_layout/pkg/DESCR
@@ -1,7 +1,7 @@
-mod_layout is an Apache module to wrap pages.  This means that you
-can add at both the beginning (header) and the end (footer) of the
-document some information.  By using the Layout directive, you can
-actually dynamically insert layouts anywhere in the document. This
-allows you to create a single look and feel throughout a website
-without using server side includes (SSI) to "automagically" add
-content in either of these two locations.
+mod_layout is an Apache module to wrap pages.  This means that you can
+add at both the beginning (header) and the end (footer) of the document
+some information.  By using the Layout directive, you can actually
+dynamically insert layouts anywhere in the document.  This allows you to
+create a single look and feel throughout a website without using server
+side includes (SSI) to "automagically" add content in either of these
+two locations.