Bug 15962

Summary: Recent change to ddup causes 'make install' to fail. Corrected.
Product: Ports & Packages Reporter: cjm2 <cjm2>
Component: Individual Port(s)Assignee: Ade Lovett <ade>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.shar none

Description cjm2 2000-01-07 13:10:01 UTC 
A recent change to net/ddup caused the install target to fail.  Corrected
this error and cleaned up some of my earlier non-fatal mistakes.

How-To-Repeat: 
'make install' after January 02, 2000 commit.
Comment 1 ade 2000-01-08 01:50:10 UTC 
On Thu, Jan 06, 2000 at 08:49:36PM -0500, cjm2@altavista.net wrote:
> 
> >Number:         15962
> >Category:       ports
> >Synopsis:       Recent change to ddup causes 'make install' to fail. Corrected.
>
> [snip]

Can you resubmit this as a unified diff to the current port,
as mentioned in:

	http://www.freebsd.org/handbook/porting.html#PORT-UPGRADING

and I'll take care of it.

Thanks,
	-aDe

-- 
Ade Lovett, Austin, TX.
Comment 2 Ade Lovett freebsd_committer freebsd_triage 2000-01-08 01:50:18 UTC 
Responsible Changed
From-To: freebsd-ports->ade

I'll handle this.
Comment 3 Christopher J. Michaels 2000-01-08 15:22:15 UTC 
diff -ruN ddup.bak/Makefile ddup/Makefile
--- ddup.bak/Makefile	Sun Jan  2 06:35:01 2000
+++ ddup/Makefile	Sat Jan  8 10:13:35 2000
@@ -22,6 +22,7 @@
 		${WRKSRC}/INSTALL-C
 
 post-install:
+	${INSTALL_MAN} ${FILESDIR}/ddup.1 ${PREFIX}/man/man1
 	strip ${PREFIX}/sbin/ddup
 
 .include <bsd.port.mk>
diff -ruN ddup.bak/patches/patch-ab ddup/patches/patch-ab
--- ddup.bak/patches/patch-ab	Sun Oct 31 21:08:06 1999
+++ ddup/patches/patch-ab	Sat Jan  8 10:13:35 2000
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Aug  3 15:19:22 1999
-+++ Makefile	Sun Oct 31 14:18:43 1999
+--- Makefile.orig	Tue Aug  3 16:19:22 1999
++++ Makefile	Thu Jan  6 20:36:09 2000
 @@ -2,8 +2,9 @@
  # $Id: Makefile,v 2.1 1999/08/03 20:17:25 thomas Exp thomas $
  # Change these options
@@ -8,38 +8,37 @@
 -INSTALL_PATH = /usr/sbin
 +CC ?= gcc
 +INSTALL_PATH = ${PREFIX}/sbin
-+DFLAGS = ${CFLAGS} -DCONFIGFILE=\"${PREFIX}/etc/ddup.conf\"
++CFLAGS += -DCONFIGFILE=\"${PREFIX}/etc/ddup.conf\"
  
  # no need to edit past here
  
-@@ -13,22 +14,24 @@
+@@ -13,22 +14,23 @@
  	${CC} -o ddup ddup.o getopt.o getopt1.o parse_config.o parse_option.o
  
  ddup.o : ddup.c
 -	${CC} -c ddup.c
-+	${CC} ${DFLAGS} -c ddup.c
++	${CC} ${CFLAGS} -c ddup.c
  
  getopt.o : getopt.c
 -	${CC} -c getopt.c
-+	${CC} ${DFLAGS} -c getopt.c
++	${CC} ${CFLAGS} -c getopt.c
  
  getopt1.o : getopt1.c
 -	${CC} -c getopt1.c
-+	${CC} ${DFLAGS} -c getopt1.c
++	${CC} ${CFLAGS} -c getopt1.c
  
  parse_config.o : parse_config.c
 -	${CC} -c parse_config.c
-+	${CC} ${DFLAGS} -c parse_config.c
++	${CC} ${CFLAGS} -c parse_config.c
  
  parse_option.o : parse_option.c
 -	${CC} -c parse_option.c
-+	${CC} ${DFLAGS} -c parse_option.c
++	${CC} ${CFLAGS} -c parse_option.c
  
  install : ddup
 -	cp ddup ${INSTALL_PATH}/ddup
 +	${BSD_INSTALL_PROGRAM} ddup ${INSTALL_PATH}
 +	${BSD_INSTALL_DATA} ddup.conf ${PREFIX}/etc/ddup.conf.default
-+	${BSD_INSTALL_MAN} ddup.1 ${PREFIX}/man/man1
  
  clean :
  	rm -f *.o ddup
Comment 4 Ade Lovett freebsd_committer freebsd_triage 2000-01-08 17:05:27 UTC 
State Changed
From-To: open->closed

Update committed, thanks!