Date: Sat, 21 Apr 2007 00:14:57 -0400 (EDT) From: Thomas Abthorpe <thomas@goodking.ca> To: FreeBSD-gnats-submit@FreeBSD.org Cc: thomas@goodking.ca Subject: ports/111976: [MAINTAINER] misc/sword: unbreak on 7.X Message-ID: <200704210414.l3L4Evem085187@goodking.goodking.ca> Resent-Message-ID: <200704210420.l3L4K3Ou092082@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111976
>Category: ports
>Synopsis: [MAINTAINER] misc/sword: unbreak on 7.X
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 21 04:20:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Thomas Abthorpe
>Release: FreeBSD 6.2-RELEASE-p3 i386
>Organization:
GoodKing.Ca
>Environment:
System: FreeBSD goodking.goodking.ca 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #2: Fri Mar 16 16:20:06 EDT 2007
>Description:
- unbreak on 7.X, use ${GMAKE} instead of make
- fix CONFIGURE_ARGS while I am here
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- sword-1.5.9_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/sword/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile 22 Mar 2007 09:34:23 -0000 1.27
+++ Makefile 21 Apr 2007 04:11:57 -0000
@@ -21,17 +21,11 @@
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake:19
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+= --without-conf --without-clucene
+CONFIGURE_ARGS+= --without-conf --without-lucene
USE_LDCONFIG= yes
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-.include <bsd.port.pre.mk>
-
-.if ( ${OSVERSION} >= 700000 )
-BROKEN= does not build on 7.X
-.endif
-
.if defined(WITHOUT_CURL)
CONFIGURE_ARGS+= --without-curl
PLIST_SUB+= INSTALLMGR="@comment "
@@ -51,7 +45,7 @@
post-install:
@${MKDIR} ${PREFIX}/share/sword/mods.d
.if !exists(${PREFIX}/etc/sword.conf)
- @(cd ${WRKSRC} && make install_config)
+ @(cd ${WRKSRC} && ${GMAKE} install_config)
.else
@${ECHO_CMD} "Config file not installed since ${PREFIX}/etc/sword.conf already exists."
@${ECHO_CMD} "Please check that DataPath points to your modules (default ${DATADIR}).";
@@ -60,6 +54,6 @@
@${CAT} ${PKGMESSAGE}
register:
- @(cd ${WRKSRC} && make register)
+ @(cd ${WRKSRC} && ${GMAKE} register)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- sword-1.5.9_3.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?200704210414.l3L4Evem085187>