ports/132762: quilt port fixes
Dirk Jagdmann
doj at cubic.org
Tue Mar 17 23:50:01 UTC 2009
>Number: 132762
>Category: ports
>Synopsis: quilt port fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 17 23:50:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Dirk Jagdmann
>Release: 7.1-RELEASE i386
>Organization:
cubic
>Environment:
>Description:
The patches below fix building/installing of quilt. They make three modifications:
1) the current quilt release only works with bash3 and not the new bash4 release. The Makefile now has the correct bash version as a dependency.
2) the pkg-plist contains a fix if the rpmbuild option is selected.
3) the pkg-plist file can deal with a sendmail binary not beeing in the default directory (/usr/sbin/).
>How-To-Repeat:
>Fix:
--- Makefile.orig 2009-03-17 20:08:16.000000000 +0000
+++ Makefile 2009-03-17 21:14:41.000000000 +0000
@@ -12,9 +12,9 @@
MASTER_SITE_SUBDIR= quilt
MAINTAINER= doj at cubic.org
-COMMENT= A collection of bash scripts to ease working with patch files
+COMMENT= A collection of bash3 scripts to ease working with patch files
-BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash3 \
gcp:${PORTSDIR}/sysutils/coreutils \
gsed:${PORTSDIR}/textproc/gsed \
gpatch:${PORTSDIR}/devel/patch \
@@ -54,6 +54,12 @@
CONFIGURE_ARGS+= --disable-nls
.endif
+.if !exists(${LOCALBASE}/sbin/sendmail)
+PLIST_SUB+= SENDMAIL=""
+.else
+PLIST_SUB+= SENDMAIL="@comment "
+.endif
+
.if defined(NOPORTDOCS)
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Makefile.in
.endif
--- pkg-plist.orig 2009-03-17 21:09:38.000000000 +0000
+++ pkg-plist 2009-03-17 21:14:41.000000000 +0000
@@ -49,8 +49,8 @@
%%DATADIR%%/compat/date
%%DATADIR%%/compat/sed
%%DATADIR%%/compat/patch
-%%DATADIR%%/compat/sendmail
-%%RPMBUILD%%share/libexec/quilt/compat/rpmbuild
+%%SENDMAIL%%%%DATADIR%%/compat/sendmail
+%%RPMBUILD%%%%DATADIR%%/compat/rpmbuild
@dirrmtry etc/bash_completion.d
@dirrmtry lib/quilt
@dirrm %%DATADIR%%/compat
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list