[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-05-04 09:43:15
|
jlea 04/05/04 02:43:08
Modified: htdocs bsd.port.mk-fpkg.patch
Log:
20040504 diff to bsd.port.mk
Revision Changes Path
1.3 +34 -25 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bsd.port.mk-fpkg.patch 29 Apr 2004 14:17:23 -0000 1.2
+++ bsd.port.mk-fpkg.patch 4 May 2004 09:43:08 -0000 1.3
@@ -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 29 Apr 2004 14:12:02 -0000
++++ bsd.port.mk 3 May 2004 10:11:06 -0000
@@ -764,13 +764,11 @@
# to turn them off (default: ${ECHO_CMD}).
# PATCH_DEBUG - If set, print out more information about the patches as
@@ -36,7 +36,7 @@
.endif
PLIST_SUB+= XAWVER=${XAWVER}
-@@ -1779,12 +1775,11 @@
+@@ -1779,12 +1775,10 @@
PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME}
.endif
@@ -49,12 +49,11 @@
+.if exists(/root/bin/fpkg)
+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
PKG_CMD?= ${LOCALBASE}/sbin/pkg_create
-@@ -1803,13 +1798,13 @@
+@@ -1803,13 +1797,13 @@
# Does the pkg_create tool support conflict checking?
# XXX Slow?
.if !defined(PKGINSTALLVER)
@@ -70,7 +69,7 @@
.if !defined(NO_MTREE)
PKG_ARGS+= -m ${MTREE_FILE}
.endif
-@@ -1819,6 +1814,23 @@
+@@ -1819,6 +1813,23 @@
.if defined(CONFLICTS) && !defined(DISABLE_CONFLICTS)
PKG_ARGS+= -C "${CONFLICTS}"
.endif
@@ -94,7 +93,7 @@
.endif
.if defined(PKG_NOCOMPRESS)
PKG_SUFX?= .tar
-@@ -1829,8 +1841,6 @@
+@@ -1829,8 +1840,6 @@
PKG_SUFX?= .tgz
.endif
.endif
@@ -103,7 +102,7 @@
MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp
-@@ -2337,7 +2347,7 @@
+@@ -2337,7 +2346,7 @@
CONFIGURE_LOG?= config.log
# A default message to print if do-configure fails.
@@ -112,7 +111,16 @@
.if defined(GNU_CONFIGURE)
# Maximum command line length
-@@ -3148,20 +3158,7 @@
+@@ -3087,7 +3096,7 @@
+ 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'`; \
++ prfx=`${PKG_CMD} -q info -p $${entry} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
+ if [ "x${PREFIX}" = "x$${prfx}" ]; then \
+ conflicting=1;\
+ conflicts_with="$${conflicts_with} $${entry}";\
+@@ -3148,20 +3157,7 @@
fi; \
fi
@__softMAKEFLAGS='${__softMAKEFLAGS:S/'/'\''/g}'; \
@@ -134,7 +142,7 @@
if [ -d ${PACKAGES} ]; then \
cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
fi; \
-@@ -3230,34 +3227,16 @@
+@@ -3230,34 +3226,16 @@
.if !target(check-already-installed)
check-already-installed:
.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
@@ -167,7 +175,7 @@
- exit 1; \
- fi
+ @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed"
-+ @if ${PKG_INFO} -e ${PKGNAME}; then \
++ @if ${PKG_CMD} -e ${PKGNAME}; then \
+ ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \
+ ${ECHO_CMD} " You may wish to \`\`make deinstall'' and install this port again"; \
+ ${ECHO_CMD} " by \`\`make reinstall'' to upgrade it properly."; \
@@ -179,7 +187,7 @@
.else
@${DO_NADA}
.endif
-@@ -3487,9 +3466,9 @@
+@@ -3487,9 +3465,9 @@
_BUILD_SEQ= build-message pre-build pre-build-script do-build \
post-build post-build-script
_INSTALL_DEP= build
@@ -191,7 +199,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 +3637,8 @@
+@@ -3658,22 +3636,8 @@
@${ECHO_MSG} "===> Returning to user credentials"
.else
@${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}"
@@ -216,7 +224,7 @@
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
.endif
-@@ -3691,15 +3656,8 @@
+@@ -3691,15 +3655,8 @@
@${ECHO_MSG} "===> Returning to user credentials"
.else
@${ECHO_MSG} "===> Deinstalling for ${PKGORIGIN}"
@@ -234,33 +242,34 @@
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
.endif
-@@ -4221,7 +4179,7 @@
+@@ -4221,7 +4178,7 @@
else \
(cd $$dir; \
tmp=`${MAKE} -V PKGNAME`; \
- if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \
-+ if ! ${PKG_INFO} -e $${tmp}; then \
++ if ! ${PKG_CMD} -e $${tmp}; then \
${MAKE} fetch; \
fi ); \
fi; \
-@@ -4249,7 +4207,7 @@
+@@ -4249,7 +4206,7 @@
else \
(cd $$dir; \
tmp=`${MAKE} -V PKGNAME`; \
- if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \
-+ if ! ${PKG_INFO} -e $${tmp}; then \
++ if ! ${PKG_CMD} -e $${tmp}; then \
${MAKE} fetch-list; \
fi ); \
fi; \
-@@ -4305,6 +4263,7 @@
- @${PACKAGE-DEPENDS-LIST}
- .endif
+@@ -4307,7 +4264,7 @@
-+# 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 @@
+- installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \
++ installed=$$(${PKG_CMD} -qo list ${PKGORIGIN}:${PKGNAME} 2>/dev/null || \
+ ${TRUE}); \
+ if [ "$$installed" ]; then \
+ break; \
+@@ -4341,11 +4298,45 @@
# Print out package names.
@@ -310,7 +319,7 @@
.endif
# Build packages for port and dependencies
-@@ -4620,50 +4613,8 @@
+@@ -4620,50 +4611,8 @@
.if !target(fake-pkg)
fake-pkg:
.if !defined(NO_PKG_REGISTER)
@@ -359,7 +368,7 @@
- ${RM} -f /tmp/${PKGNAME}-required-by; \
- fi
+ @${ECHO_MSG} "===> Registering installation for ${PKGNAME}"
-+ @${PKG_CREATE} ${PKG_ARGS} -O ${PKGNAME} | ${PKG_ADD} ${PKG_FORCE_ARG} -O
++ @${PKG_CREATE} ${PKG_ARGS} -O ${PKGNAME} | ${PKG_ADD} -v ${PKG_FORCE_ARG} -O
.else
@${DO_NADA}
.endif
|
