From 7a66ae0d2625ed5973ef8dd220c128d3593fb934 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 19 Apr 2008 19:06:45 +0000
Subject: [PATCH] Update to newstyle buildpkg metadata. Add patch to fix
 DESTDIR install.

---
 patch/build.sh                      | 80 ++++++++---------------------
 patch/meta/pkgdef                   |  9 ++++
 patch/meta/pkginfo.in               | 11 ----
 patch/meta/relnotes                 | 27 ++++++++++
 patch/src/patch-2.5.4-destdir.patch | 38 ++++++++++++++
 5 files changed, 96 insertions(+), 69 deletions(-)
 create mode 100644 patch/meta/pkgdef
 delete mode 100644 patch/meta/pkginfo.in
 create mode 100644 patch/meta/relnotes
 create mode 100644 patch/src/patch-2.5.4-destdir.patch

diff --git a/patch/build.sh b/patch/build.sh
index fa72c0d..514345a 100755
--- a/patch/build.sh
+++ b/patch/build.sh
@@ -1,33 +1,28 @@
-#!/bin/bash
+#!/usr/tgcware/bin/bash
 #
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=patch
 version=2.5.4
-pkgver=2
+pkgver=1
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=patch-2.5.4-destdir.patch
 
 # Source function library
-. ${HOME}/buildpkg/scripts/buildpkg.functions
+. ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-name="GNU Patch"
-pkgvendor="http://www.gnu.org"
-pkgdesc="Patch - Applies a patch to a file"
-
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
+# Global settings
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+shortroot=1
+ac_overrides="ac_cv_path_ed_PROGRAM=/usr/bin/ed"
 
 reg prep
 prep()
@@ -41,16 +36,23 @@ build()
     generic_build
 }
 
+reg check
+check()
+{
+    generic_check
+}
+
 reg install
 install()
 {
-    generic_install prefix
+    generic_install DESTDIR
+    doc README NEWS ChangeLog COPYING
 }
 
 reg pack
 pack()
 {
-    generic_pack shortroot
+    generic_pack
 }
 
 reg distclean
@@ -62,42 +64,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/patch/meta/pkgdef b/patch/meta/pkgdef
new file mode 100644
index 0000000..d0d4144
--- /dev/null
+++ b/patch/meta/pkgdef
@@ -0,0 +1,9 @@
+[patch]
+pkgname="${pkgprefix}${topdir}"
+name="$topdir - GNU patch"
+pkgcat="application"
+pkgvendor="http://www.fsf.org/software/patch/patch.html"
+shortdesc="Applies a patch to a file"
+pkgver="$pkgver"
+files(-,root,bin)
+*
diff --git a/patch/meta/pkginfo.in b/patch/meta/pkginfo.in
deleted file mode 100644
index 95b0128..0000000
--- a/patch/meta/pkginfo.in
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG="%%pkgname%%"
-NAME="%%name%%"
-ARCH="sparc"
-VERSION="%%version%%"
-CATEGORY="%%pkgcat%%"
-VENDOR="%%pkgvendor%%"
-EMAIL="Tom G. Christenen - tgc@statsbiblioteket.dk"
-PSTAMP="%%pkgver%%"
-BASEDIR="%%topinstalldir%%"
-CLASSES="none"
-DESC="%%pkgdesc%%"
diff --git a/patch/meta/relnotes b/patch/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/patch/meta/relnotes
@@ -0,0 +1,27 @@
+PACKAGE DETAILS
+---------------
+Name:	    %%PKGNAME%%
+Version:    %%SOURCE_AND_VER%%
+Vendor:	    %%VENDOR%%
+Packager:   %%PKGEDBY%%
+
+Source (sha1sum):
+%%SOURCE_SHA1SUM%%
+
+BUILD DETAILS
+-------------
+Compiler:
+%%COMPILER%%
+
+Environment:
+%%ENVIRONMENT%%
+
+Configure:
+%%CONFIGURE%%
+
+KNOWN DEPENDENCIES
+------------------
+%%DEPENDENCIES%%
+
+ERRORS/MISCELLANEOUS
+--------------------
diff --git a/patch/src/patch-2.5.4-destdir.patch b/patch/src/patch-2.5.4-destdir.patch
new file mode 100644
index 0000000..e11c87e
--- /dev/null
+++ b/patch/src/patch-2.5.4-destdir.patch
@@ -0,0 +1,38 @@
+*** patch-2.5.4/Makefile.in.destdir	Sat Apr 19 20:52:21 2008
+--- patch-2.5.4/Makefile.in	Sat Apr 19 20:54:44 2008
+***************
+*** 41,46 ****
+--- 41,48 ----
+  U = @U@
+  VERSION = @VERSION@
+  
++ DESTDIR =
++ 
+  prefix = @prefix@
+  exec_prefix = @exec_prefix@
+  
+***************
+*** 97,107 ****
+  	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+  
+  install:: all installdirs
+! 	$(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT)
+! 	-$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext)
+  
+  installdirs::
+! 	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(man1dir)
+  
+  install-strip::
+  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+--- 99,109 ----
+  	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+  
+  install:: all installdirs
+! 	$(INSTALL_PROGRAM) patch$(EXEEXT) $(DESTDIR)$(bindir)/$(patch_name)$(EXEEXT)
+! 	-$(INSTALL_DATA) $(srcdir)/patch.man $(DESTDIR)$(man1dir)/$(patch_name)$(man1ext)
+  
+  installdirs::
+! 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+  
+  install-strip::
+  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install