svn commit: r338512 - in head/mail/bmf: . files

Matthias Andree mandree at FreeBSD.org
Fri Jan 3 01:00:06 UTC 2014


Author: mandree
Date: Fri Jan  3 01:00:05 2014
New Revision: 338512
URL: http://svnweb.freebsd.org/changeset/ports/338512

Log:
  - Attempt to fix build on systems without gcc (error was:
  - Stageify.
  - No longer silence post-* targets.

Modified:
  head/mail/bmf/Makefile   (contents, props changed)
  head/mail/bmf/files/patch-Makefile.in   (contents, props changed)
  head/mail/bmf/files/patch-configure   (contents, props changed)
  head/mail/bmf/pkg-plist   (contents, props changed)

Modified: head/mail/bmf/Makefile
==============================================================================
--- head/mail/bmf/Makefile	Fri Jan  3 00:46:47 2014	(r338511)
+++ head/mail/bmf/Makefile	Fri Jan  3 01:00:05 2014	(r338512)
@@ -15,7 +15,6 @@ OPTIONS_DEFAULT=	BDB
 BDB_DESC=			Berkeley DB support (may specify w/ WITH_BDB_VER)
 MYSQL_DESC=			Adds MySQL Support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
@@ -34,16 +33,19 @@ CONFIGURE_ARGS+=--with-mysql
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-package
+NEED_ROOT=	yes
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--debug=yes
 .endif
 
-MAN1=	bmf.1 bmfconv.1
+post-patch:
+	${REINPLACE_CMD} -e 's/@@CC/${CC}/;s/@@CXX/${CXX}/' ${WRKSRC}/configure
 
 post-install:
-	@ ${MKDIR} ${PREFIX}/share/bmf
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/bmf
-	@ ${CAT} ${PKGDIR}/pkg-message
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmf
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmfconv
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/bmf
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/bmf
 
 .include <bsd.port.mk>

Modified: head/mail/bmf/files/patch-Makefile.in
==============================================================================
--- head/mail/bmf/files/patch-Makefile.in	Fri Jan  3 00:46:47 2014	(r338511)
+++ head/mail/bmf/files/patch-Makefile.in	Fri Jan  3 01:00:05 2014	(r338512)
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2002-10-21 04:27:56.000000000 +0800
-+++ Makefile.in	2011-09-28 14:53:25.000000000 +0800
+--- ./Makefile.in.orig	2002-10-20 22:27:56.000000000 +0200
++++ ./Makefile.in	2014-01-03 01:50:13.000000000 +0100
 @@ -1,11 +1,11 @@
  # Makefile for bmf
  

Modified: head/mail/bmf/files/patch-configure
==============================================================================
--- head/mail/bmf/files/patch-configure	Fri Jan  3 00:46:47 2014	(r338511)
+++ head/mail/bmf/files/patch-configure	Fri Jan  3 01:00:05 2014	(r338512)
@@ -1,10 +1,20 @@
---- configure.orig	Fri Apr  4 14:07:12 2003
-+++ configure	Fri Apr  4 14:08:48 2003
-@@ -134,9 +134,9 @@
+--- ./configure.orig	2002-10-19 11:44:49.000000000 +0200
++++ ./configure	2014-01-03 01:50:13.000000000 +0100
+@@ -127,16 +127,16 @@
+       CCDBG="-DNDEBUG"
+       LDDBG=""
+     fi
+-    CC=gcc
++    CC=@@CC
+     CFLAGS="$CCDBG -D_UNIX -D_BSD=$OSVER -Wall"
+-    CXX=g++
++    CXX=@@CXX
+     CXXFLAGS=${CFLAGS}
      AR=ar
      ARFLAGS="-rc"
-     LD=gcc
+-    LD=gcc
 -    LDFLAGS="$LDDBG"
++    LD=@@CC
 +    LDFLAGS="${LDFLAGS}"
      SYSLIBS=""
 -    LIBDB_LIB=""

Modified: head/mail/bmf/pkg-plist
==============================================================================
--- head/mail/bmf/pkg-plist	Fri Jan  3 00:46:47 2014	(r338511)
+++ head/mail/bmf/pkg-plist	Fri Jan  3 01:00:05 2014	(r338512)
@@ -1,4 +1,6 @@
 bin/bmf
 bin/bmfconv
+man/man1/bmf.1.gz
+man/man1/bmfconv.1.gz
 %%DATADIR%%/README
 @dirrm %%DATADIR%%


More information about the svn-ports-all mailing list