Redo CONFIGURE/MAKE_ARGS handling

4 files changed, 10 insertions, 53 deletions

diff --git a/irc/dancer/Makefile b/irc/dancer/Makefile
index 6dd9933c391a..8a03cbd0372d 100644
--- a/irc/dancer/Makefile
+++ b/irc/dancer/Makefile
@@ -14,21 +14,22 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IRC bot written in C for UNIX, Windows, and AmigaOS
 
+PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+GNU_CONFIGURE=	yes
+MAKE_ARGS+=	CSPECIAL="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+
 do-install:
-	@${MKDIR} ${PREFIX}/share/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	${INSTALL_DATA} \
-		${WRKSRC}/example/dancer.config \
-		${WRKSRC}/example/dancer.users \
-		${WRKSRC}/example/dancer.funcs \
-		${WRKSRC}/example/dancer.explain \
-			${PREFIX}/share/${PORTNAME}/
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../${PORTNAME} ${PREFIX}/bin/
+	cd ${WRKSRC}/../example && ${INSTALL_DATA} \
+		dancer.config dancer.users \
+		dancer.funcs dancer.explain ${DATADIR}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500000
 LDFLAGS+=	-lm
-MAKE_ARGS+=	LDFLAGS="${LDFLAGS}"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/irc/dancer/files/patch-Makefile b/irc/dancer/files/patch-Makefile
deleted file mode 100644
index ba28e6a5edfb..000000000000
--- a/irc/dancer/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	Thu Jun 26 23:43:33 2003
-+++ Makefile.new	Thu Jun 26 23:44:58 2003
-@@ -23,7 +23,7 @@
- PRG = dancer
- 
- all: src/config.h
--	(cd src; make debug)
-+	(cd src; make)
- 
- src/config.h:
- 	(cd src; ./configure; cd ..)
diff --git a/irc/dancer/files/patch-aa b/irc/dancer/files/patch-aa
deleted file mode 100644
index 4dcf21c4e9dd..000000000000
--- a/irc/dancer/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile	Sun Mar 18 03:58:38 2001
-+++ Makefile.new	Fri Jan  3 00:51:20 2003
-@@ -26,10 +26,10 @@
- 	(cd src; make debug)
- 
- src/config.h:
--	(cd src; ./configure; cd ..; /bin/sh fplcheck)
-+	(cd src; ./configure; cd ..)
- 
- configure:
--	(cd src; ./configure; cd ..; /bin/sh fplcheck)
-+	(cd src; ./configure; cd ..)
- 
- install:
- 	/bin/sh installbot
diff --git a/irc/dancer/files/patch-src::Makefile.in b/irc/dancer/files/patch-src::Makefile.in
deleted file mode 100644
index 507df276db47..000000000000
--- a/irc/dancer/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.in	Mon Nov 13 02:42:37 2000
-+++ src/Makefile.in.new	Thu Jun 26 23:32:18 2003
-@@ -22,10 +22,11 @@
- 
- CSPECIAL =
- 
--CC = @CC@
--CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CSPECIAL)
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+CC ?= @CC@
-+CFLAGS ?= @CFLAGS@
-+CFLAGS += @DEFS@ $(CSPECIAL)
-+LDFLAGS ?= @LDFLAGS@
-+LIBS ?= @LIBS@
- 
- RM = 'rm'
-