Date: Wed, 10 Nov 2004 00:52:04 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: daniel@roe.ch Subject: ports/73724: [PATCH] mail/libspf: fix dependency Message-ID: <20041109165204.8B1493EAF1A@utopia.leeym.com> Resent-Message-ID: <200411091700.iA9H0sJx085375@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73724
>Category: ports
>Synopsis: [PATCH] mail/libspf: fix dependency
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 09 17:00:54 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.3-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Oct 25 01:17:22 CST 2004
>Description:
- define getopt_long_only as getopt_long and remove dependency on libgnugetopt
Port maintainer (daniel@roe.ch) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- libspf-0.25.b.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/libspf/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile 19 Jun 2004 09:21:28 -0000 1.2
+++ Makefile 9 Nov 2004 16:50:46 -0000
@@ -14,9 +14,7 @@
MAINTAINER= daniel@roe.ch
COMMENT= Sender Policy Framework (SPF) library and client
-# Require getopt_long_only - USE_GETOPT_LONG is *not* sufficient
-LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
+USE_GETOPT_LONG=yes
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${PORTNAME}.25
USE_GMAKE= yes
@@ -24,8 +22,8 @@
INSTALLS_SHLIB= yes
LIBSPF_REV= 1
PLIST_SUB= PORTNAME=${PORTNAME} LIBSPF_REV=${LIBSPF_REV}
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${WRKSRC}"
+CPPFLAGS+= -Dgetopt_long_only=getopt_long
+LDFLAGS+= -L${WRKSRC}
# Supported tunables:
#
@@ -70,18 +68,17 @@
-e 's,^CFLAGS:=.*,CFLAGS+=-Wall -D_BSD_SOURCE ${SPF_CFLAGS},' \
-e 's/^CPPFLAGS:=/#CPPFLAGS:=/' \
-e 's/^LDFLAGS:=/#LDFLAGS:=/' \
- -e 's/make/gmake/g' \
+ -e 's/make /${GMAKE} /g' \
-e 's/-lresolv//g' \
-e 's/libspf.a : -lc/libspf.a :/g' \
-e 's/libspf\.so\.1\.0\.1/libspf.so.${LIBSPF_REV}/g' \
-e 's/-soname,libspf\.so\.1/-soname,libspf.so.${LIBSPF_REV}/g' \
${WRKSRC}/Makefile
@${REINPLACE_CMD} \
- -e 's/^CFLAGS:=/#CFLAGS:=/' \
- -e 's/^CPPFLAGS:=/#CPPFLAGS:=/' \
- -e 's/^LDFLAGS:=/#LDFLAGS:=/' \
- -e 's/make/gmake/g' \
- -e 's/\(-o spfquery ..\)/\1 -lgnugetopt/g' \
+ -e 's,^CFLAGS:=,CFLAGS:=${CFLAGS} ${CPPFLAGS},' \
+ -e 's,^CPPFLAGS:=,CPPFLAGS:=${CPPFLAGS},' \
+ -e 's,^LDFLAGS:=.*,LDFLAGS=${LDFLAGS},' \
+ -e 's/make /${GMAKE} /g' \
-e 's/-o spfquery/-o spfquery-${PORTNAME}/g' \
${WRKSRC}/tools/Makefile
@${REINPLACE_CMD} \
--- libspf-0.25.b.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041109165204.8B1493EAF1A>