tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: emacs packages fail
>> I've already reported this bug about year ago but it is still not fixed.
>> http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=37146
>> Result of 'make show-var VARNAME=DEPENDS' should not depend
>> on whether emacs is installed or not.
> I remind that problem is that 'pkg_info -e [x]emacs' is run in order
> to get the emacs version.
> How about the attached patch?
> Tests are also available.
Oops.
Missed part of the patch
Index: mk/apache.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/apache.mk,v
retrieving revision 1.25
diff -u -r1.25 apache.mk
--- mk/apache.mk 17 Dec 2007 22:09:58 -0000 1.25
+++ mk/apache.mk 9 Sep 2008 20:55:31 -0000
@@ -70,6 +70,9 @@
_APACHE_PKG_PREFIX.apache22= ap22
_APACHE_PKGSRCDIR.apache22= ../../www/apache22
+# for multi-variant packages and bulk build software
+VARIANTS+= PKG_APACHE_DEFAULT=${PKG_APACHE_ACCEPTED:ts,}
+
#
# Sanity checks.
#
Index: mk/emacs.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/emacs.mk,v
retrieving revision 1.49
diff -u -r1.49 emacs.mk
--- mk/emacs.mk 1 Mar 2008 05:11:10 -0000 1.49
+++ mk/emacs.mk 9 Sep 2008 20:55:31 -0000
@@ -246,6 +246,18 @@
_EMACS_BLNK.xemacs215= ../../editors/xemacs-current/buildlink3.mk
_EMACS_BLNK.xemacs215nox= ../../editors/xemacs-current-nox11/buildlink3.mk
+_EMACS_VER_FN.emacs21= ../../editors/emacs21/Makefile.ver
+_EMACS_VER_FN.emacs21nox= ../../editors/emacs21/Makefile.ver
+_EMACS_VER_FN.emacs22= ../../editors/emacs/Makefile.ver
+_EMACS_VER_FN.emacs22nox= ../../editors/emacs/Makefile.ver
+_EMACS_VER_FN.emacs20= ../../editors/emacs20/Makefile.ver
+_EMACS_VER_FN.xemacs215= ../../editors/xemacs-current/Makefile.ver
+_EMACS_VER_FN.xemacs215nox= ../../editors/xemacs-current/Makefile.ver
+_EMACS_VER_FN.xemacs214= ../../editors/xemacs/Makefile.ver
+_EMACS_VER_FN.xemacs214nox= ../../editors/xemacs/Makefile.ver
+
+.include "${_EMACS_VER_FN.${EMACS_TYPE}}"
+
#
# Version decision
#
@@ -287,10 +299,6 @@
. endif
.endif
-_EMACS_VERSION_CMD!= ${PKG_INFO} -e "${_EMACS_PKGBASE}" || ${ECHO}
-.if ${_EMACS_VERSION_CMD} != ""
-_EMACS_VERSION_FULL= ${_EMACS_VERSION_CMD}
-_EMACS_VERSION= ${_EMACS_VERSION_FULL:C/^${_EMACS_PKGBASE}-//}
_EMACS_VERSION_MAJOR= ${_EMACS_VERSION:C/\..*//}
_EMACS_VERSION_MINOR= ${_EMACS_VERSION:C/^[0-9]*\.//:C/[^0-9].*//}
_EMACS_VERSION_NOREV= ${_EMACS_VERSION:C/[a-z].*$//}
@@ -298,7 +306,6 @@
dep="${_EMACS_REQD.${_EMACS_TYPE}:Q}"; \
${PKG_ADMIN} pmatch "$$dep" "${_EMACS_PKGBASE}"; \
if [ $$? = 0 ]; then ${ECHO} "yes"; else ${ECHO} "no"; fi
-.endif
EMACS_VERSIONS_ACCEPTED?= ${_EMACS_VERSIONS_ACCEPTED_DEFAULT}
--
Best regards, Aleksey Cheusov.
Home |
Main Index |
Thread Index |
Old Index