diff -ur Original/generic-build-script New/generic-build-script --- Original/generic-build-script 2003-10-26 23:14:08.000000000 -0600 +++ New/generic-build-script 2003-11-21 17:30:10.750328000 -0600 @@ -24,6 +24,7 @@ export VER=`echo $tscriptname | sed -e "s/${PKG}\-//" -e 's/\-[^\-]*$//'` export REL=`echo $tscriptname | sed -e "s/${PKG}\-${VER}\-//"` export FULLPKG=${PKG}-${VER}-${REL} +export NEWVER="" # Place Holder for 'newer' version number # determine correct decompression option and tarball filename if [ -e ${PKG}-${VER}.tar.gz ] ; then @@ -48,6 +49,7 @@ export instdir=${srcdir}/.inst export srcinstdir=${srcdir}/.sinst export checkfile=${topdir}/${FULLPKG}.check + # run on host=i686-pc-cygwin # if this package creates binaries, they run on @@ -57,6 +59,8 @@ MY_CFLAGS="-O2" MY_LDFLAGS= +export ThePackageReadMeFile="${instdir}${prefix}/share/doc/Cygwin/${PKG}-${VER}.README" + mkdirs() { (cd ${topdir} && \ rm -fr ${objdir} ${instdir} ${srcinstdir} && \ @@ -123,11 +127,11 @@ fi && \ if [ -f ${srcdir}/CYGWIN-PATCHES/${PKG}.README ]; then \ /usr/bin/install -m 644 ${srcdir}/CYGWIN-PATCHES/${PKG}.README \ - ${instdir}${prefix}/share/doc/Cygwin/${PKG}-${VER}.README ; \ + "${ThePackageReadMeFile}" ; \ else \ if [ -f ${srcdir}/CYGWIN-PATCHES/README ]; then \ /usr/bin/install -m 644 ${srcdir}/CYGWIN-PATCHES/README \ - ${instdir}${prefix}/share/doc/Cygwin/${PKG}-${VER}.README ; \ + "${ThePackageReadMeFile}" ; \ fi ;\ fi ;\ if [ -f ${srcdir}/CYGWIN-PATCHES/postinstall.sh ] ; then \ @@ -142,9 +146,23 @@ true ) } list() { - (cd ${instdir} && \ - find . -name "*" ! -type d | sed 's/\.\/\(.*\)/\1/' - true ) + if [ -s "${ThePackageReadMeFile}" ] + then + TmpPackageReadMe="/tmp/$(/usr/bin/basename "${ThePackageReadMeFile}")" + (cd ${instdir} && \ + find . -name "*" | sed 's/\.\/\(.*\)/ \/\1/' | \ + sed -e "s#%PKG%#${PKG}#g" \ + -e "s#%VER%#${VER}#g" \ + -e "s#%REL%#${REL}#g" \ + -e "s#%NEWER_VER%#${NEWVER}#g" \ + -e '\|%THEFILES%| e /usr/bin/cat -' \ + -e '\|%THEFILES%| d' \ + "${ThePackageReadMeFile}" > \ + "${TmpPackageReadMe}" && \ + mv -f "${TmpPackageReadMe}" \ + "${ThePackageReadMeFile}" && \ + true ) + fi } pkg() { (cd ${instdir} && \ @@ -188,7 +206,7 @@ spkg) spkg ; STATUS=$? ;; finish) finish ; STATUS=$? ;; all) prep && conf && build && install && \ - strip && pkg && spkg && finish ; \ + strip && list && pkg && spkg && finish ; \ STATUS=$? ;; *) echo "Error: bad arguments" ; exit 1 ;; esac diff -ur Original/generic-readme New/generic-readme --- Original/generic-readme 2003-09-12 12:36:02.000000000 -0500 +++ New/generic-readme 2003-11-17 17:24:44.467372800 -0600 @@ -1,4 +1,4 @@ - +%PKG% ------------------------------------------ @@ -21,36 +21,36 @@ ------------------------------------ Build instructions: - unpack -VER-REL-src.tar.bz2 + unpack %PKG%-%VER%-%REL%-src.tar.bz2 if you use setup to install this src package, it will be unpacked under /usr/src automatically cd /usr/src - ./-VER-REL.sh all + ./%PKG%-%VER%-%REL%.sh all This will create: - /usr/src/-VER-REL.tar.bz2 - /usr/src/-VER-REL-src.tar.bz2 + /usr/src/%PKG%-%VER%-%REL%.tar.bz2 + /usr/src/%PKG%-%VER%-%REL%-src.tar.bz2 ------------------------------------------- Files included in the binary distro /usr/bin/... - /usr/share/doc/-/AUTHORS - /usr/share/doc/-/... - /usr/share/doc/Cygwin/-.README + /usr/share/doc/%PKG%-%VER%/AUTHORS + /usr/share/doc/Cygwin/%PKG%-%VER%.README /usr/share/man/man1/... /usr/share/info/... - /etc/postinstall/.sh + /etc/postinstall/%PKG%.sh +%THEFILES% ------------------ Port Notes: ------ version ----- +----- version %NEWER_VER% ----- Other information ------ version ----- +----- version %VER% ----- Initial release