Message-ID: <456BB0E6.8050200@users.sourceforge.net>
Date: Mon, 27 Nov 2006 21:45:42 -0600
From: "Yaakov S (Cygwin Ports)" <yselkowitz AT users DOT sourceforge DOT net>
User-Agent: Thunderbird 1.5.0.8 (Windows/20061025)
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
Subject: Re: cygport bug
References: <456AF27D DOT 1040208 AT byu DOT net> <456AF4D8 DOT 8000703 AT byu DOT net>
In-Reply-To: <456AF4D8.8000703@byu.net>
Content-Type: multipart/mixed;  boundary="------------010201000709030701080404"
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com

--------------010201000709030701080404
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> Actually, that isn't all that is needed, since git creates
> /usr/lib/perl5/site_perl/5.8/cygwin/auto/Git/.packlist, and that .packlist
> also needs the same treatment.  Maybe I need to figure out how to make git
> use PERL_VENDORLIB, instead of patching cygport; any advice from other
> maintainers who have made a package with an included perl module?

Try the attached .cygport and .src.patch with a stock cygport.  I will
consider adding some logic to detect the (IMO erraneous) use of
site_perl instead of vendor_perl.


Yaakov
Cygwin Ports
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFa7DlpiWmPGlmQSMRAoSYAJ4v4vaHDGVkb6tkImo/ZbxyCKRrUgCePgdU
01ZN6Eg5Sz4GWMALabja+RE=
=QtrQ
-----END PGP SIGNATURE-----

--------------010201000709030701080404
Content-Type: text/plain;
 name="git-1.4.4.1-2.cygport"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="git-1.4.4.1-2.cygport"

# git.cygport - directions for packaging git for cygwin

# Copyright (C) 2006 Eric Blake
# This file is free software; I give unlimited permission to copy and/or
# distribute it, with or without modifications, as long as this notice is
# preserved.

inherit perl

DESCRIPTION="Fast Version Control System"
HOMEPAGE=http://git.or.cz
SRC_URI="http://kernel.org/pub/software/scm/$PN/$P.tar.bz2 \
	http://kernel.org/pub/software/scm/$PN/$P.tar.bz2.sign"

MAKEOPTS='prefix=/usr'

src_compile()
{
  # git does not include a configure script
  lndirs
  cd $B
  cygmake
}

src_install()
{
  cd $B
  cyginstall
  perl_postinst
}

# Local Variables:
# fill-column: 72
# mode: sh
# sh-indentation: 2
# End:

--------------010201000709030701080404
Content-Type: text/plain;
 name="git-1.4.4.1-2.src.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="git-1.4.4.1-2.src.patch"

diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x Makefile.in.in -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x mdate-sh -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x configure -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x omf.make -x xmldocs.make origsrc/git-1.4.4.1/Makefile src/git-1.4.4.1/Makefile
--- origsrc/git-1.4.4.1/Makefile	2006-11-22 20:38:07.000000000 -0600
+++ src/git-1.4.4.1/Makefile	2006-11-27 21:37:38.748875000 -0600
@@ -369,11 +369,8 @@
 endif
 ifeq ($(uname_O),Cygwin)
 	NO_D_TYPE_IN_DIRENT = YesPlease
-	NO_D_INO_IN_DIRENT = YesPlease
 	NO_STRCASESTR = YesPlease
-	NO_SYMLINK_HEAD = YesPlease
 	NEEDS_LIBICONV = YesPlease
-	NO_C99_FORMAT = YesPlease
 	# There are conflicting reports about this.
 	# On some boxes NO_MMAP is needed, and not so elsewhere.
 	# Try uncommenting this if you see things break -- YMMV.
@@ -769,7 +766,7 @@
 
 perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
 	(cd perl && $(PERL_PATH) Makefile.PL \
-		PREFIX='$(prefix_SQ)')
+		PREFIX='$(prefix_SQ)' INSTALLDIRS=vendor)
 
 doc:
 	$(MAKE) -C Documentation all


--------------010201000709030701080404
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------010201000709030701080404--