[Fpkg-cvs] CVS: www/htdocs bsd.port.mk-fpkg.patch
Status: Alpha
Brought to you by:
jlea
Menu
▾
▴
[Fpkg-cvs] CVS: www/htdocs bsd.port.mk-fpkg.patch
|
From: Jeremy L. <jl...@us...> - 2004-04-29 14:17:30
|
jlea 04/04/29 07:17:23
Modified: htdocs bsd.port.mk-fpkg.patch
Log:
Update the bsd.port.mk patch slightly.
Revision Changes Path
1.2 +78 -127 www/htdocs/bsd.port.mk-fpkg.patch
Index: bsd.port.mk-fpkg.patch
===================================================================
RCS file: /cvsroot/fpkg/www/htdocs/bsd.port.mk-fpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd.port.mk-fpkg.patch 26 Apr 2004 09:56:11 -0000 1.1
+++ bsd.port.mk-fpkg.patch 29 Apr 2004 14:17:23 -0000 1.2
@@ -4,7 +4,7 @@
retrieving revision 1.488
diff -u -r1.488 bsd.port.mk
--- bsd.port.mk 19 Apr 2004 23:39:52 -0000 1.488
-+++ bsd.port.mk 22 Apr 2004 06:52:47 -0000
++++ bsd.port.mk 29 Apr 2004 14:12:02 -0000
@@ -764,13 +764,11 @@
# to turn them off (default: ${ECHO_CMD}).
# PATCH_DEBUG - If set, print out more information about the patches as
@@ -47,9 +47,9 @@
-PKG_INFO?= ${LOCALBASE}/sbin/pkg_info
-PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version
+.if exists(/root/bin/fpkg)
-+PKG_CREATE?= /root/bin/pkg_create
-+PKG_ADD?= /root/bin/pkg_add
-+PKG_INFO?= /root/bin/pkg_info
++PKG_CREATE?= /root/bin/fpkg_create
++PKG_ADD?= /root/bin/fpkg_add
++PKG_INFO?= /root/bin/fpkg_info
+PKG_CMD?= /root/bin/fpkg
.elif ${OSVERSION} < 460102 && ${PKGORIGIN} != "sysutils/pkg_install"
BUILD_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/sysutils/pkg_install
@@ -66,23 +66,35 @@
.endif
.if !defined(PKG_ARGS)
-PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
-+PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} `cd ${.CURDIR} && ${MAKE} package-depends-args` ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
++PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} `cd ${.CURDIR} && ${MAKE} package-depends-args` ${EXTRA_PKG_ARGS}
.if !defined(NO_MTREE)
PKG_ARGS+= -m ${MTREE_FILE}
.endif
-@@ -1820,6 +1815,11 @@
+@@ -1819,6 +1814,23 @@
+ .if defined(CONFLICTS) && !defined(DISABLE_CONFLICTS)
PKG_ARGS+= -C "${CONFLICTS}"
.endif
- .endif
++.if exists(${PKGINSTALL})
++PKG_ARGS+= -i ${PKGINSTALL}
++.endif
++.if exists(${PKGDEINSTALL})
++PKG_ARGS+= -k ${PKGDEINSTALL}
++.endif
++.if exists(${PKGREQ})
++PKG_ARGS+= -r ${PKGREQ}
++.endif
++.if exists(${PKGMESSAGE})
++PKG_ARGS+= -D ${PKGMESSAGE}
++.endif
++.endif
+.if defined(FORCE_PKG_REGISTER)
+PKG_FORCE_ARG= -f
+.else
+PKG_FORCE_ARG=
-+.endif
+ .endif
.if defined(PKG_NOCOMPRESS)
PKG_SUFX?= .tar
- .else
-@@ -1829,8 +1829,6 @@
+@@ -1829,8 +1841,6 @@
PKG_SUFX?= .tgz
.endif
.endif
@@ -91,7 +103,7 @@
MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp
-@@ -2337,7 +2335,7 @@
+@@ -2337,7 +2347,7 @@
CONFIGURE_LOG?= config.log
# A default message to print if do-configure fails.
@@ -100,60 +112,29 @@
.if defined(GNU_CONFIGURE)
# Maximum command line length
-@@ -3071,43 +3069,6 @@
- .endif
- .endif
-
--# Check conflicts
--
--.if !target(check-conflicts)
--check-conflicts:
--.if defined(CONFLICTS) && !defined(DISABLE_CONFLICTS)
-- @${RM} -f ${WRKDIR}/.CONFLICTS
--.for conflict in ${CONFLICTS}
-- @found="`${LS} -d ${PKG_DBDIR}/${conflict} 2>/dev/null || ${TRUE}`"; \
-- if [ X"$$found" != X"" ]; then \
-- ${ECHO_CMD} "$$found" >> ${WRKDIR}/.CONFLICTS; \
-- fi
--.endfor
-- @if [ -s ${WRKDIR}/.CONFLICTS ]; then \
-- found=`${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e s'|${PKG_DBDIR}/||g' | ${TR} '\012' ' '`; \
-- conflicting=0; \
-- for entry in $${found}; do \
-- prfx=`${PKG_INFO} -q -p $${entry} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
-- if [ "x${PREFIX}" = "x$${prfx}" ]; then \
-- conflicting=1;\
-- conflicts_with="$${conflicts_with} $${entry}";\
-- fi;\
-- done; \
-- ${ECHO_MSG}; \
-- if [ "x$${conflicting}" = "x1" ] ; then \
-- ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \
-- for entry in $${conflicts_with} ; do \
-- ${ECHO_MSG} " $${entry}";\
-- done;\
-- ${ECHO_MSG} " They install files into the same place."; \
-- ${ECHO_MSG} " Please remove them first with pkg_delete(1)."; \
-- ${RM} -f ${WRKDIR}/.CONFLICTS; \
-- exit 1; \
-- fi ;\
-- fi
--.endif # CONFLICTS
--.endif
--
- # Install
-
- .if !target(do-install)
-@@ -3161,7 +3122,7 @@
- if [ -f ${PKGMESSAGE} ]; then \
- _LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
- fi; \
+@@ -3148,20 +3158,7 @@
+ fi; \
+ fi
+ @__softMAKEFLAGS='${__softMAKEFLAGS:S/'/'\''/g}'; \
+- _LATE_PKG_ARGS=""; \
+- if [ -f ${PKGINSTALL} ]; then \
+- _LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -i ${PKGINSTALL}"; \
+- fi; \
+- if [ -f ${PKGDEINSTALL} ]; then \
+- _LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -k ${PKGDEINSTALL}"; \
+- fi; \
+- if [ -f ${PKGREQ} ]; then \
+- _LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -r ${PKGREQ}"; \
+- fi; \
+- if [ -f ${PKGMESSAGE} ]; then \
+- _LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
+- fi; \
- if ${PKG_CMD} ${PKG_ARGS} ${PKGFILE}; then \
+ if ${PKG_CREATE} ${PKG_ARGS} ${PKGFILE}; then \
if [ -d ${PACKAGES} ]; then \
cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
fi; \
-@@ -3230,34 +3191,16 @@
+@@ -3230,34 +3227,16 @@
.if !target(check-already-installed)
check-already-installed:
.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
@@ -198,7 +179,7 @@
.else
@${DO_NADA}
.endif
-@@ -3487,9 +3430,9 @@
+@@ -3487,9 +3466,9 @@
_BUILD_SEQ= build-message pre-build pre-build-script do-build \
post-build post-build-script
_INSTALL_DEP= build
@@ -210,7 +191,7 @@
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
pre-su-install-script do-install post-install add-plist-info \
post-install-script add-plist-docs compress-man run-ldconfig fake-pkg \
-@@ -3658,22 +3601,8 @@
+@@ -3658,22 +3637,8 @@
@${ECHO_MSG} "===> Returning to user credentials"
.else
@${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}"
@@ -235,7 +216,7 @@
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
.endif
-@@ -3691,15 +3620,8 @@
+@@ -3691,15 +3656,8 @@
@${ECHO_MSG} "===> Returning to user credentials"
.else
@${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}"
@@ -253,7 +234,7 @@
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
.endif
-@@ -4221,7 +4143,7 @@
+@@ -4221,7 +4179,7 @@
else \
(cd $$dir; \
tmp=`${MAKE} -V PKGNAME`; \
@@ -262,7 +243,7 @@
${MAKE} fetch; \
fi ); \
fi; \
-@@ -4249,7 +4171,7 @@
+@@ -4249,7 +4207,7 @@
else \
(cd $$dir; \
tmp=`${MAKE} -V PKGNAME`; \
@@ -271,75 +252,45 @@
${MAKE} fetch-list; \
fi ); \
fi; \
-@@ -4300,52 +4222,45 @@
- # Package (recursive runtime) dependency list. Print out both directory names
- # and package names.
+@@ -4305,6 +4263,7 @@
+ @${PACKAGE-DEPENDS-LIST}
+ .endif
+
++# XXX: (reg) This needs a new feature to check origin?
+ PACKAGE-DEPENDS-LIST?= \
+ if [ "${CHILD_DEPENDS}" ]; then \
+ installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \
+@@ -4341,11 +4300,45 @@
--package-depends-list:
--.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS)
-- @${PACKAGE-DEPENDS-LIST}
--.endif
--
--PACKAGE-DEPENDS-LIST?= \
-- if [ "${CHILD_DEPENDS}" ]; then \
-- installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \
-- ${TRUE}); \
-- if [ "$$installed" ]; then \
-- break; \
-- fi; \
-- if [ -z "$$installed" ]; then \
-- installed="${PKGNAME}"; \
-- fi; \
-- for pkgname in $$installed; do \
-- ${ECHO_CMD} "$$pkgname ${.CURDIR} ${PKGORIGIN}"; \
-- done; \
-- fi; \
-- checked="${PARENT_CHECKED}"; \
-- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
-- dir=$$(${REALPATH} $$dir); \
-- if [ -d $$dir ]; then \
-- if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
-- childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \
-- set -- $$childout; \
-- childdir=""; \
-- while [ $$\# != 0 ]; do \
-- childdir="$$childdir $$2"; \
-- ${ECHO_CMD} "$$1 $$2 $$3"; \
-- shift 3; \
-- done; \
-- checked="$$dir $$childdir $$checked"; \
-- fi; \
-- else \
-- ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
-- fi; \
-- done
--
# Print out package names.
-+# XXX: (reg) Add ${DEPENDS}
- package-depends:
+-package-depends:
-.if ${OSVERSION} >= 460102 || exists(${LOCALBASE}/sbin/pkg_info)
- @${PACKAGE-DEPENDS-LIST} | ${AWK} '{print $$1":"$$3}'
-+ @for i in ${LIB_DEPENDS}; do \
-+ pkgdep="$$pkgdep -L `${ECHO} $$i | ${SED} -e 's/:.*//'`"; \
-+ done; \
-+ for i in ${RUN_DEPENDS}; do \
-+ pkgdep="$$pkgdep -F `${ECHO} $$i | ${SED} -e 's/:.*//'`"; \
-+ done; \
-+ if [ "$$pkgdep" != "" ]; then \
-+ ${PKG_CMD} which $$pkgdep; \
-+ fi | sort -u
-+
-+# XXX: (reg) Add ${DEPENDS}
+package-depends-args:
++.if defined(LIB_DEPENDS)
+ @for i in ${LIB_DEPENDS}; do \
-+ pkgdep=`${ECHO} $$i | ${SED} -e 's/:.*//'`; \
-+ ${ECHO} "-L $$pkgdep"; \
-+ done; \
-+ for i in ${RUN_DEPENDS}; do \
-+ pkgdep=`${ECHO} $$i | ${SED} -e 's/:.*//'`; \
-+ ${ECHO} "-R $$pkgdep"; \
++ pkgdep=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \
++ ${ECHO_CMD} "-L $$pkgdep"; \
+ done | sort -u
++.endif
++.if defined(RUN_DEPENDS)
++ @for i in ${RUN_DEPENDS}; do \
++ pkgdep=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \
++ ${ECHO_CMD} "-R $$pkgdep"; \
++ done | sort -u
++.endif
++.if defined(DEPENDS)
++ @for dir in $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | sort -u); do \
++ if [ -d $$dir ]; then \
++ pkgdep=`cd $$dir; ${MAKE} -V PKGNAME`; \
++ pkgorg=`cd $$dir; ${MAKE} -V PKGORIGIN`; \
++ ${ECHO_CMD} "-P $$pkgdep:$$pkgorg"; \
++ else \
++ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
++ fi; \
++ done | sort -u
++.endif
+
+.if !target(check-plist-conflicts)
+check-plist-conflicts:
@@ -359,7 +310,7 @@
.endif
# Build packages for port and dependencies
-@@ -4620,50 +4535,8 @@
+@@ -4620,50 +4613,8 @@
.if !target(fake-pkg)
fake-pkg:
.if !defined(NO_PKG_REGISTER)
|
