Skip site navigation (1)Skip section navigation (2)
Date:      02 Jul 2000 03:25:58 -0700
From:      asami@FreeBSD.org (Satoshi - Ports Wraith - Asami)
To:        Maxim Sobolev <sobomax@FreeBSD.org>
Cc:        ports@FreeBSD.org
Subject:   Re: cvs commit: ports/net/ucd-snmp Makefile
Message-ID:  <vqck8f47rrd.fsf@silvia.hip.berkeley.edu>
In-Reply-To: Maxim Sobolev's message of "Sun, 18 Jun 2000 02:36:13 -0700 (PDT)"
References:  <200006180936.CAA97894@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
 * sobomax     2000/06/18 02:36:13 PDT

 *   The port assigns PLIST_SUB after <bsd.port.pre.mk> is included, so substitution
 *   of %%PREFIX%% for ldconfig didn't work.

 *   Revision  Changes    Path
 *   1.48      +3 -3      ports/net/ucd-snmp/Makefile

Yikes.  This is a bug in bsd.port.mk, it shouldn't require anything to
be defined in Makefiles with +=.

Will the following fix the problem?  (Note this is a hand-edited patch
-- don't worry about the extra context....)

Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.340
diff -u -r1.340 bsd.port.mk
--- bsd.port.mk	2000/06/16 21:52:40	1.340
+++ bsd.port.mk	2000/07/02 10:21:45
@@ -608,12 +611,10 @@
 .endif
 .if defined(USE_X_PREFIX)
 PREFIX?=		${X11BASE}
 .else
 PREFIX?=		${LOCALBASE}
 .endif
 
-PLIST_SUB+=		PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-
 .if defined(USE_OPENSSL)
 .if ${OSVERSION} >= 400014
 .if !exists(/usr/lib/libcrypto.so)
@@ -682,14 +685,15 @@
 .else
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 .endif
+
+PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
-PLIST_SUB+=	OSREL=${OSREL}
 
 CONFIGURE_ENV+=	PORTOBJFORMAT=${PORTOBJFORMAT}
 SCRIPTS_ENV+=	PORTOBJFORMAT=${PORTOBJFORMAT}
 MAKE_ENV+=		PORTOBJFORMAT=${PORTOBJFORMAT}
 PLIST_SUB+=		PORTOBJFORMAT=${PORTOBJFORMAT}
 
 .if defined(MANCOMPRESSED)
 .if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \
 	${MANCOMPRESSED} != maybe


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?vqck8f47rrd.fsf>