| Summary: | bsd.port.mk contains non-existing autoconf version | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Oliver Eikemeier <eikemeier> |
| Component: | Individual Port(s) | Assignee: | Ade Lovett <ade> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | CC: | ade |
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-ports-bugs->portmgr portmgr territory We need to patch port devel/autoconf257 to satisfy the dependency
logic in bsd.port.mk:
Mk/bsd.port.mk line 1205:
.elif ${use_acver} == ${old_acver} || ${use_acver} == ${dev_acver}
AUTOCONF_DIR= ${LOCALBASE}/share/autoconf${use_acver}
acpath= ${LOCALBASE}/libexec/autoconf${use_acver}
BUILD_DEPENDS+= ${acpath}/autoconf:${PORTSDIR}/devel/autoconf${use_acver}
The following patch does the trick:
--- autoconf257.patch begins here ---
diff -Nur devel/autoconf257/Makefile.orig devel/autoconf257/Makefile
--- devel/autoconf257/Makefile.orig Mon Jun 30 02:05:25 2003
+++ devel/autoconf257/Makefile Wed Jul 9 15:00:35 2003
@@ -7,7 +7,7 @@
PORTNAME= autoconf
PORTVERSION= 2.57
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
@@ -68,6 +68,11 @@
post-install:
.for FILE in ${GENERIC_TOOLS}
${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION}
+.endfor
+ ${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION}
+.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames
+ ${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
+ ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i}
.endfor
.include <bsd.port.mk>
diff -Nur devel/autoconf257/pkg-plist.orig devel/autoconf257/pkg-plist
--- devel/autoconf257/pkg-plist.orig Mon Jun 30 02:05:25 2003
+++ devel/autoconf257/pkg-plist Wed Jul 9 14:57:43 2003
@@ -11,6 +11,12 @@
info/standards%%BUILD_VERSION%%.info
@exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir
@exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir
+libexec/autoconf%%BUILD_VERSION%%/autoconf
+libexec/autoconf%%BUILD_VERSION%%/autoheader
+libexec/autoconf%%BUILD_VERSION%%/autoreconf
+libexec/autoconf%%BUILD_VERSION%%/autoscan
+libexec/autoconf%%BUILD_VERSION%%/autoupdate
+libexec/autoconf%%BUILD_VERSION%%/ifnames
share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm
share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm
share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm
@@ -50,6 +56,7 @@
share/autoconf%%BUILD_VERSION%%/mdate-sh
share/autoconf%%BUILD_VERSION%%/missing
share/autoconf%%BUILD_VERSION%%/mkinstalldirs
+@dirrm libexec/autoconf%%BUILD_VERSION%%
@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar
@dirrm share/autoconf%%BUILD_VERSION%%/autotest
@dirrm share/autoconf%%BUILD_VERSION%%/autoscan
--- autoconf257.patch ends here ---
or should I post it to an addisitonal PR?
Responsible Changed From-To: portmgr->ade I'll take care of this as part of upcoming autoconf/automake foo. updated patch for bsd.port.mk:
--- bsd.port.mk.patch begins here ---
--- Mk/bsd.port.mk.orig Wed Sep 3 21:50:24 2003
+++ Mk/bsd.port.mk Fri Sep 5 00:47:56 2003
@@ -221,7 +221,7 @@
# WANT_AUTOCONF_VER (PORT MAY SET THIS VALUE)
# - Implies GNU_CONFIGURE=yes.
# - Says that the port wants autoconf; legal values
-# are: 213, 253, 254.
+# are: 213, 253, 257.
# - Each specify a version of autoconf to use
# and appropriatly set AUTOCONF{,_DIR} and other
# autoconf-related program paths.
@@ -1185,7 +1185,7 @@
dev_amver= 17
old_acver= 213
cur_acver= 253
-dev_acver= 254
+dev_acver= 257
########## automake setup
.if defined(USE_AUTOMAKE_VER)
@@ -1242,7 +1242,7 @@
acpath= ${LOCALBASE}/libexec/autoconf${use_acver}
BUILD_DEPENDS+= ${acpath}/autoconf:${PORTSDIR}/devel/autoconf${use_acver}
.else # bad autoconf version
-BROKEN="unknown AUTOCONF version: ${USE_AUTOCONF_VER}"
+BROKEN="unknown AUTOCONF version: ${use_acver}"
.endif # ${use_acver} == ${cur_acver}
.endif # defined(WANT_AUTOCONF_VER)
--- bsd.port.mk.patch ends here ---
State Changed From-To: open->closed This is now fixed. |
bsd.port.mk check for WANT_AUTOCONF_VER 213, 253 or 254, but port devel/autoconf254 doesn't exists. Fix: port devel/autoconf257 exists: even though this seems a little big fragile on the long run...--2YjMR150PQT5lnR43c2Z0idzJmdopsaM8rNAn5AuthAWphAp Content-Type: text/plain; name="bsd.port.mk.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bsd.port.mk.patch" --- Mk/bsd.port.mk.orig Mon Jul 7 11:05:40 2003 +++ Mk/bsd.port.mk Wed Jul 9 13:53:09 2003 @@ -222,7 +222,7 @@ # WANT_AUTOCONF_VER (PORT MAY SET THIS VALUE) # - Implies GNU_CONFIGURE=yes. # - Says that the port wants autoconf; legal values -# are: 213, 253, 254. +# are: 213, 253, 257. # - Each specify a version of autoconf to use # and appropriatly set AUTOCONF{,_DIR} and other # autoconf-related program paths. @@ -1150,7 +1150,7 @@ dev_amver= 17 old_acver= 213 cur_acver= 253 -dev_acver= 254 +dev_acver= 257 ########## automake setup .if defined(USE_AUTOMAKE_VER) How-To-Repeat: define WANT_AUTOCONF_VER= 254 in a ports Makefile