- Fix Makefile and pkg-plist

- Respect CFLAGS

PR: 22541
Submitted by: MAINTAINER

6 files changed, 214 insertions, 224 deletions

diff --git a/sysutils/doinkd/Makefile b/sysutils/doinkd/Makefile
index 2040354d5007..3b289983a8ee 100644
--- a/sysutils/doinkd/Makefile
+++ b/sysutils/doinkd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	idled
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.darkwing.com/idled/download/	\
 		ftp://ftp.cs.hope.edu/pub/idled/
diff --git a/sysutils/doinkd/files/patch-aa b/sysutils/doinkd/files/patch-aa
index 3ee4e8a06aad..dec410047dd7 100644
--- a/sysutils/doinkd/files/patch-aa
+++ b/sysutils/doinkd/files/patch-aa
@@ -1,112 +1,105 @@
-*** Makefile.orig	Thu Mar 13 14:19:42 1997
---- Makefile	Thu Mar 13 13:59:57 1997
-***************
-*** 165,191 ****
-  #        If you add it, '-lkvm' must also be added to the SPECLIBS line
-  # You will need to delete parse.c before compiling!  You can either
-  # do so by hand, or do a 'make clean' followed by the normal 'make'.
-! #DEFS += -O -m486
-! #DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
-  #DEFS += -DPROC_SEARCH_1
-  #SPECLIBS = -lkvm
-! #INSTTYPE = install1a
-  #
-! #DEST    = /usr/local/libexec
-! #CFDEST  = /usr/local/libexec
-! #MDEST   = /usr/local/man
-! #LOGDEST = /var/log
-  #
-! #OWNER   = root
-! #CFOWNER = root
-! #MOWNER  = man
-  #
-! #GROUP   = daemon
-! #CFGROUP = daemon
-  #
-! #MODE    = 750
-! #CFMODE  = 664
-! #MMODE   = 444
-  
-  ######################################################################
-  ######################################################################
---- 165,191 ----
-  #        If you add it, '-lkvm' must also be added to the SPECLIBS line
-  # You will need to delete parse.c before compiling!  You can either
-  # do so by hand, or do a 'make clean' followed by the normal 'make'.
-! DEFS += -O
-! DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
-  #DEFS += -DPROC_SEARCH_1
-  #SPECLIBS = -lkvm
-! INSTTYPE = install1a
-  #
-! DEST    = /usr/local/libexec
-! CFDEST  = /usr/local/etc
-! MDEST   = /usr/local/man
-! LOGDEST = /var/log
-  #
-! OWNER   = root
-! CFOWNER = root
-! MOWNER  = man
-  #
-! GROUP   = daemon
-! CFGROUP = daemon
-  #
-! MODE    = 750
-! CFMODE  = 664
-! MMODE   = 444
-  
-  ######################################################################
-  ######################################################################
-***************
-*** 215,239 ****
-  # SVR4  --  Solaris 2.x
-  # Use install3 for /usr/sbin/install
-  # and install1 for /usr/ucb/install
-! DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
-! SPECLIBS = 
-! INSTTYPE = install3
-  
-! DEST    = /usr/local/bin
-! CFDEST  = /usr/local/lib
-! MDEST   = /usr/local/man
-! LOGDEST = /var/log
-  
-! OWNER   = root
-! CFOWNER = root
-! MOWNER  = root
-  
-! GROUP   = root
-! CFGROUP = root
-  
-! MODE    = 750
-! CFMODE  = 664
-! MMODE   = 644
-  
-  ######################################################################
-  ######################################################################
---- 215,239 ----
-  # SVR4  --  Solaris 2.x
-  # Use install3 for /usr/sbin/install
-  # and install1 for /usr/ucb/install
-! #DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
-! #SPECLIBS = 
-! #INSTTYPE = install3
-  
-! #DEST    = /usr/local/bin
-! #CFDEST  = /usr/local/lib
-! #MDEST   = /usr/local/man
-! #LOGDEST = /var/log
-  
-! #OWNER   = root
-! #CFOWNER = root
-! #MOWNER  = root
-  
-! #GROUP   = root
-! #CFGROUP = root
-  
-! #MODE    = 750
-! #CFMODE  = 664
-! #MMODE   = 644
-  
-  ######################################################################
-  ######################################################################
+--- Makefile.orig	Fri Nov  3 00:09:06 2000
++++ Makefile	Fri Nov  3 00:12:54 2000
+@@ -2,8 +2,8 @@
+ #
+ 
+ # C compiler flags
+-CC = cc
+-RM = rm
++CC ?= cc
++RM ?= rm
+ INCLUDE = 
+ 
+ ######################################################################
+@@ -166,26 +166,26 @@
+ # You will need to delete parse.c before compiling!  You can either
+ # do so by hand, or do a 'make clean' followed by the normal 'make'.
+ #DEFS += -O -m486
+-#DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
++DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
+ #DEFS += -DPROC_SEARCH_1
+ #SPECLIBS = -lkvm
+-#INSTTYPE = install1a
++INSTTYPE = install1a
+ #
+-#DEST    = /usr/local/libexec
+-#CFDEST  = /usr/local/libexec
+-#MDEST   = /usr/local/man
+-#LOGDEST = /var/log
++DEST    = ${PREFIX}/libexec
++CFDEST  = ${PREFIX}/etc
++MDEST   = ${PREFIX}/man
++LOGDEST = /var/log
+ #
+-#OWNER   = root
+-#CFOWNER = root
+-#MOWNER  = man
++OWNER   = root
++CFOWNER = root
++MOWNER  = man
+ #
+-#GROUP   = daemon
+-#CFGROUP = daemon
++GROUP   = daemon
++CFGROUP = daemon
+ #
+-#MODE    = 750
+-#CFMODE  = 664
+-#MMODE   = 444
++MODE    = 750
++CFMODE  = 664
++MMODE   = 444
+ 
+ ######################################################################
+ ######################################################################
+@@ -215,25 +215,25 @@
+ # SVR4  --  Solaris 2.x
+ # Use install3 for /usr/sbin/install
+ # and install1 for /usr/ucb/install
+-DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
+-SPECLIBS = 
+-INSTTYPE = install3
+-
+-DEST    = /usr/local/bin
+-CFDEST  = /usr/local/lib
+-MDEST   = /usr/local/man
+-LOGDEST = /var/log
++#DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
++#SPECLIBS = 
++#INSTTYPE = install3
+ 
+-OWNER   = root
+-CFOWNER = root
+-MOWNER  = root
++#DEST    = /usr/local/bin
++#CFDEST  = /usr/local/lib
++#MDEST   = /usr/local/man
++#LOGDEST = /var/log
+ 
+-GROUP   = root
+-CFGROUP = root
++#OWNER   = root
++#CFOWNER = root
++#MOWNER  = root
+ 
+-MODE    = 750
+-CFMODE  = 664
+-MMODE   = 644
++#GROUP   = root
++#CFGROUP = root
++
++#MODE    = 750
++#CFMODE  = 664
++#MMODE   = 644
+ 
+ ######################################################################
+ ######################################################################
+@@ -428,7 +428,7 @@
+ # HERE are the big CFLAGS
+ # Add -g if you want debugging
+ # Add -O or whatever variant for optimization
+-CFLAGS = ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
++CFLAGS+= ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
+ 
+ # For HP's ANSI C compiler (use -g instead of +O3 for debugging)
+ # CFLAGS = +O3 -Aa -D_HPUX_SOURCE ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
diff --git a/sysutils/doinkd/pkg-plist b/sysutils/doinkd/pkg-plist
index 4ac08ae35bc3..079138685481 100644
--- a/sysutils/doinkd/pkg-plist
+++ b/sysutils/doinkd/pkg-plist
@@ -1,2 +1,3 @@
 etc/idled.cf.template
+etc/rc.d/idled.sh
 libexec/idled
diff --git a/sysutils/idled/Makefile b/sysutils/idled/Makefile
index 2040354d5007..3b289983a8ee 100644
--- a/sysutils/idled/Makefile
+++ b/sysutils/idled/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	idled
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.darkwing.com/idled/download/	\
 		ftp://ftp.cs.hope.edu/pub/idled/
diff --git a/sysutils/idled/files/patch-aa b/sysutils/idled/files/patch-aa
index 3ee4e8a06aad..dec410047dd7 100644
--- a/sysutils/idled/files/patch-aa
+++ b/sysutils/idled/files/patch-aa
@@ -1,112 +1,105 @@
-*** Makefile.orig	Thu Mar 13 14:19:42 1997
---- Makefile	Thu Mar 13 13:59:57 1997
-***************
-*** 165,191 ****
-  #        If you add it, '-lkvm' must also be added to the SPECLIBS line
-  # You will need to delete parse.c before compiling!  You can either
-  # do so by hand, or do a 'make clean' followed by the normal 'make'.
-! #DEFS += -O -m486
-! #DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
-  #DEFS += -DPROC_SEARCH_1
-  #SPECLIBS = -lkvm
-! #INSTTYPE = install1a
-  #
-! #DEST    = /usr/local/libexec
-! #CFDEST  = /usr/local/libexec
-! #MDEST   = /usr/local/man
-! #LOGDEST = /var/log
-  #
-! #OWNER   = root
-! #CFOWNER = root
-! #MOWNER  = man
-  #
-! #GROUP   = daemon
-! #CFGROUP = daemon
-  #
-! #MODE    = 750
-! #CFMODE  = 664
-! #MMODE   = 444
-  
-  ######################################################################
-  ######################################################################
---- 165,191 ----
-  #        If you add it, '-lkvm' must also be added to the SPECLIBS line
-  # You will need to delete parse.c before compiling!  You can either
-  # do so by hand, or do a 'make clean' followed by the normal 'make'.
-! DEFS += -O
-! DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
-  #DEFS += -DPROC_SEARCH_1
-  #SPECLIBS = -lkvm
-! INSTTYPE = install1a
-  #
-! DEST    = /usr/local/libexec
-! CFDEST  = /usr/local/etc
-! MDEST   = /usr/local/man
-! LOGDEST = /var/log
-  #
-! OWNER   = root
-! CFOWNER = root
-! MOWNER  = man
-  #
-! GROUP   = daemon
-! CFGROUP = daemon
-  #
-! MODE    = 750
-! CFMODE  = 664
-! MMODE   = 444
-  
-  ######################################################################
-  ######################################################################
-***************
-*** 215,239 ****
-  # SVR4  --  Solaris 2.x
-  # Use install3 for /usr/sbin/install
-  # and install1 for /usr/ucb/install
-! DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
-! SPECLIBS = 
-! INSTTYPE = install3
-  
-! DEST    = /usr/local/bin
-! CFDEST  = /usr/local/lib
-! MDEST   = /usr/local/man
-! LOGDEST = /var/log
-  
-! OWNER   = root
-! CFOWNER = root
-! MOWNER  = root
-  
-! GROUP   = root
-! CFGROUP = root
-  
-! MODE    = 750
-! CFMODE  = 664
-! MMODE   = 644
-  
-  ######################################################################
-  ######################################################################
---- 215,239 ----
-  # SVR4  --  Solaris 2.x
-  # Use install3 for /usr/sbin/install
-  # and install1 for /usr/ucb/install
-! #DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
-! #SPECLIBS = 
-! #INSTTYPE = install3
-  
-! #DEST    = /usr/local/bin
-! #CFDEST  = /usr/local/lib
-! #MDEST   = /usr/local/man
-! #LOGDEST = /var/log
-  
-! #OWNER   = root
-! #CFOWNER = root
-! #MOWNER  = root
-  
-! #GROUP   = root
-! #CFGROUP = root
-  
-! #MODE    = 750
-! #CFMODE  = 664
-! #MMODE   = 644
-  
-  ######################################################################
-  ######################################################################
+--- Makefile.orig	Fri Nov  3 00:09:06 2000
++++ Makefile	Fri Nov  3 00:12:54 2000
+@@ -2,8 +2,8 @@
+ #
+ 
+ # C compiler flags
+-CC = cc
+-RM = rm
++CC ?= cc
++RM ?= rm
+ INCLUDE = 
+ 
+ ######################################################################
+@@ -166,26 +166,26 @@
+ # You will need to delete parse.c before compiling!  You can either
+ # do so by hand, or do a 'make clean' followed by the normal 'make'.
+ #DEFS += -O -m486
+-#DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
++DEFS += -DBSD_OS2 -DHAVE_SETSID -DHAVE_YYRESTART -DPS_HACK
+ #DEFS += -DPROC_SEARCH_1
+ #SPECLIBS = -lkvm
+-#INSTTYPE = install1a
++INSTTYPE = install1a
+ #
+-#DEST    = /usr/local/libexec
+-#CFDEST  = /usr/local/libexec
+-#MDEST   = /usr/local/man
+-#LOGDEST = /var/log
++DEST    = ${PREFIX}/libexec
++CFDEST  = ${PREFIX}/etc
++MDEST   = ${PREFIX}/man
++LOGDEST = /var/log
+ #
+-#OWNER   = root
+-#CFOWNER = root
+-#MOWNER  = man
++OWNER   = root
++CFOWNER = root
++MOWNER  = man
+ #
+-#GROUP   = daemon
+-#CFGROUP = daemon
++GROUP   = daemon
++CFGROUP = daemon
+ #
+-#MODE    = 750
+-#CFMODE  = 664
+-#MMODE   = 444
++MODE    = 750
++CFMODE  = 664
++MMODE   = 444
+ 
+ ######################################################################
+ ######################################################################
+@@ -215,25 +215,25 @@
+ # SVR4  --  Solaris 2.x
+ # Use install3 for /usr/sbin/install
+ # and install1 for /usr/ucb/install
+-DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
+-SPECLIBS = 
+-INSTTYPE = install3
+-
+-DEST    = /usr/local/bin
+-CFDEST  = /usr/local/lib
+-MDEST   = /usr/local/man
+-LOGDEST = /var/log
++#DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
++#SPECLIBS = 
++#INSTTYPE = install3
+ 
+-OWNER   = root
+-CFOWNER = root
+-MOWNER  = root
++#DEST    = /usr/local/bin
++#CFDEST  = /usr/local/lib
++#MDEST   = /usr/local/man
++#LOGDEST = /var/log
+ 
+-GROUP   = root
+-CFGROUP = root
++#OWNER   = root
++#CFOWNER = root
++#MOWNER  = root
+ 
+-MODE    = 750
+-CFMODE  = 664
+-MMODE   = 644
++#GROUP   = root
++#CFGROUP = root
++
++#MODE    = 750
++#CFMODE  = 664
++#MMODE   = 644
+ 
+ ######################################################################
+ ######################################################################
+@@ -428,7 +428,7 @@
+ # HERE are the big CFLAGS
+ # Add -g if you want debugging
+ # Add -O or whatever variant for optimization
+-CFLAGS = ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
++CFLAGS+= ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
+ 
+ # For HP's ANSI C compiler (use -g instead of +O3 for debugging)
+ # CFLAGS = +O3 -Aa -D_HPUX_SOURCE ${DEFS} ${DEBUG} -DCONFIG=\"${CONFIG}\" -DLOGFILE=\"${LOGFILE}\" ${INCLUDE}
diff --git a/sysutils/idled/pkg-plist b/sysutils/idled/pkg-plist
index 4ac08ae35bc3..079138685481 100644
--- a/sysutils/idled/pkg-plist
+++ b/sysutils/idled/pkg-plist
@@ -1,2 +1,3 @@
 etc/idled.cf.template
+etc/rc.d/idled.sh
 libexec/idled