diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2008-04-09 15:44:45 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2008-04-09 15:44:45 +0000 |
| commit | 62e0a9da471dbd97358a2af54ff46f09ca112e28 (patch) | |
| tree | f91df9e21b2bfcb5a01ca723d03bb57d1e9c703e /ports-mgmt/pkg_install/files | |
| parent | 375943cada90404aa46413ee265581a9ea00e591 (diff) | |
- Updating ports-mgmt/pkg_install to a newer snapshot (20080407).
- Silence a few warnings.
- Remove support for very old versions of FreeBSD.
Notes
Notes:
svn path=/head/; revision=210940
Diffstat (limited to 'ports-mgmt/pkg_install/files')
| -rw-r--r-- | ports-mgmt/pkg_install/files/patch-Makefile.inc | 15 | ||||
| -rw-r--r-- | ports-mgmt/pkg_install/files/patch-lib_Makefile | 17 |
2 files changed, 19 insertions, 13 deletions
diff --git a/ports-mgmt/pkg_install/files/patch-Makefile.inc b/ports-mgmt/pkg_install/files/patch-Makefile.inc index 2f032e6e7d86..338bdae5fc36 100644 --- a/ports-mgmt/pkg_install/files/patch-Makefile.inc +++ b/ports-mgmt/pkg_install/files/patch-Makefile.inc @@ -1,15 +1,18 @@ ---- Makefile.inc.orig Tue Dec 21 05:16:03 2004 -+++ Makefile.inc Sat Feb 26 17:02:17 2005 -@@ -7,9 +7,11 @@ - .endif +--- Makefile.inc.orig 2008-04-09 16:15:05.000000000 +0100 ++++ Makefile.inc 2008-04-09 16:15:21.000000000 +0100 +@@ -4,11 +4,13 @@ + + LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a - .if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \ +-.if ${MK_OPENSSL} != "no" && \ - defined(LDADD) && ${LDADD:M-lfetch} != "" ++.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \ + defined(LDADD) +.if ${LDADD:M-lfetch} != "" DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto -+.endif .endif ++.endif # Inherit BINDIR from one level up. + .include "../Makefile.inc" diff --git a/ports-mgmt/pkg_install/files/patch-lib_Makefile b/ports-mgmt/pkg_install/files/patch-lib_Makefile index daa6c5966548..a7c8f533a0fe 100644 --- a/ports-mgmt/pkg_install/files/patch-lib_Makefile +++ b/ports-mgmt/pkg_install/files/patch-lib_Makefile @@ -1,19 +1,22 @@ ---- lib/Makefile.orig Sun Oct 24 11:33:07 2004 -+++ lib/Makefile Sat Feb 26 17:03:27 2005 -@@ -1,11 +1,15 @@ - # $FreeBSD: /tmp/pcvs/ports/ports-mgmt/pkg_install/files/patch-lib_Makefile,v 1.4 2005-02-26 22:06:42 marcus Exp $ +--- lib/Makefile.orig 2008-04-07 11:16:05.000000000 +0100 ++++ lib/Makefile 2008-04-09 16:39:06.000000000 +0100 +@@ -1,11 +1,18 @@ + # $FreeBSD: /tmp/pcvs/ports/ports-mgmt/pkg_install/files/patch-lib_Makefile,v 1.5 2008-04-09 15:44:45 flz Exp $ LIB= install -INTERNALLIB= SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c match.c \ deps.c version.c pkgwrap.c url.c + ++NO_PROFILE= yes ++NO_PIC= yes +NOPROFILE= yes +NOPIC= yes - ++ WARNS?= 3 WFORMAT?= 1 -+ + +install: + @echo -n - ++ .include <bsd.lib.mk> |