head	1.8;
access;
symbols
	pkgsrc-2026Q1:1.8.0.68
	pkgsrc-2026Q1-base:1.8
	pkgsrc-2025Q4:1.8.0.66
	pkgsrc-2025Q4-base:1.8
	pkgsrc-2025Q3:1.8.0.64
	pkgsrc-2025Q3-base:1.8
	pkgsrc-2025Q2:1.8.0.62
	pkgsrc-2025Q2-base:1.8
	pkgsrc-2025Q1:1.8.0.60
	pkgsrc-2025Q1-base:1.8
	pkgsrc-2024Q4:1.8.0.58
	pkgsrc-2024Q4-base:1.8
	pkgsrc-2024Q3:1.8.0.56
	pkgsrc-2024Q3-base:1.8
	pkgsrc-2024Q2:1.8.0.54
	pkgsrc-2024Q2-base:1.8
	pkgsrc-2024Q1:1.8.0.52
	pkgsrc-2024Q1-base:1.8
	pkgsrc-2023Q4:1.8.0.50
	pkgsrc-2023Q4-base:1.8
	pkgsrc-2023Q3:1.8.0.48
	pkgsrc-2023Q3-base:1.8
	pkgsrc-2023Q2:1.8.0.46
	pkgsrc-2023Q2-base:1.8
	pkgsrc-2023Q1:1.8.0.44
	pkgsrc-2023Q1-base:1.8
	pkgsrc-2022Q4:1.8.0.42
	pkgsrc-2022Q4-base:1.8
	pkgsrc-2022Q3:1.8.0.40
	pkgsrc-2022Q3-base:1.8
	pkgsrc-2022Q2:1.8.0.38
	pkgsrc-2022Q2-base:1.8
	pkgsrc-2022Q1:1.8.0.36
	pkgsrc-2022Q1-base:1.8
	pkgsrc-2021Q4:1.8.0.34
	pkgsrc-2021Q4-base:1.8
	pkgsrc-2021Q3:1.8.0.32
	pkgsrc-2021Q3-base:1.8
	pkgsrc-2021Q2:1.8.0.30
	pkgsrc-2021Q2-base:1.8
	pkgsrc-2021Q1:1.8.0.28
	pkgsrc-2021Q1-base:1.8
	pkgsrc-2020Q4:1.8.0.26
	pkgsrc-2020Q4-base:1.8
	pkgsrc-2020Q3:1.8.0.24
	pkgsrc-2020Q3-base:1.8
	pkgsrc-2020Q2:1.8.0.22
	pkgsrc-2020Q2-base:1.8
	pkgsrc-2020Q1:1.8.0.18
	pkgsrc-2020Q1-base:1.8
	pkgsrc-2019Q4:1.8.0.20
	pkgsrc-2019Q4-base:1.8
	pkgsrc-2019Q3:1.8.0.16
	pkgsrc-2019Q3-base:1.8
	pkgsrc-2019Q2:1.8.0.14
	pkgsrc-2019Q2-base:1.8
	pkgsrc-2019Q1:1.8.0.12
	pkgsrc-2019Q1-base:1.8
	pkgsrc-2018Q4:1.8.0.10
	pkgsrc-2018Q4-base:1.8
	pkgsrc-2018Q3:1.8.0.8
	pkgsrc-2018Q3-base:1.8
	pkgsrc-2018Q2:1.8.0.6
	pkgsrc-2018Q2-base:1.8
	pkgsrc-2018Q1:1.8.0.4
	pkgsrc-2018Q1-base:1.8
	pkgsrc-2017Q4:1.8.0.2
	pkgsrc-2017Q4-base:1.8
	pkgsrc-2017Q3:1.7.0.16
	pkgsrc-2017Q3-base:1.7
	pkgsrc-2017Q2:1.7.0.12
	pkgsrc-2017Q2-base:1.7
	pkgsrc-2017Q1:1.7.0.10
	pkgsrc-2017Q1-base:1.7
	pkgsrc-2016Q4:1.7.0.8
	pkgsrc-2016Q4-base:1.7
	pkgsrc-2016Q3:1.7.0.6
	pkgsrc-2016Q3-base:1.7
	pkgsrc-2016Q2:1.7.0.4
	pkgsrc-2016Q2-base:1.7
	pkgsrc-2016Q1:1.7.0.2
	pkgsrc-2016Q1-base:1.7
	pkgsrc-2015Q4:1.6.0.40
	pkgsrc-2015Q4-base:1.6
	pkgsrc-2015Q3:1.6.0.38
	pkgsrc-2015Q3-base:1.6
	pkgsrc-2015Q2:1.6.0.36
	pkgsrc-2015Q2-base:1.6
	pkgsrc-2015Q1:1.6.0.34
	pkgsrc-2015Q1-base:1.6
	pkgsrc-2014Q4:1.6.0.32
	pkgsrc-2014Q4-base:1.6
	pkgsrc-2014Q3:1.6.0.30
	pkgsrc-2014Q3-base:1.6
	pkgsrc-2014Q2:1.6.0.28
	pkgsrc-2014Q2-base:1.6
	pkgsrc-2014Q1:1.6.0.26
	pkgsrc-2014Q1-base:1.6
	pkgsrc-2013Q4:1.6.0.24
	pkgsrc-2013Q4-base:1.6
	pkgsrc-2013Q3:1.6.0.22
	pkgsrc-2013Q3-base:1.6
	pkgsrc-2013Q2:1.6.0.20
	pkgsrc-2013Q2-base:1.6
	pkgsrc-2013Q1:1.6.0.18
	pkgsrc-2013Q1-base:1.6
	pkgsrc-2012Q4:1.6.0.16
	pkgsrc-2012Q4-base:1.6
	pkgsrc-2012Q3:1.6.0.14
	pkgsrc-2012Q3-base:1.6
	pkgsrc-2012Q2:1.6.0.12
	pkgsrc-2012Q2-base:1.6
	pkgsrc-2012Q1:1.6.0.10
	pkgsrc-2012Q1-base:1.6
	pkgsrc-2011Q4:1.6.0.8
	pkgsrc-2011Q4-base:1.6
	pkgsrc-2011Q3:1.6.0.6
	pkgsrc-2011Q3-base:1.6
	pkgsrc-2011Q2:1.6.0.4
	pkgsrc-2011Q2-base:1.6
	pkgsrc-2011Q1:1.6.0.2
	pkgsrc-2011Q1-base:1.6
	pkgsrc-2010Q4:1.5.0.2
	pkgsrc-2010Q4-base:1.5
	pkgsrc-2010Q3:1.3.0.40
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.38
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.36
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.34
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.32
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.30
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.28
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.26
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.24
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.22
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.20
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.18
	pkgsrc-2008Q1:1.3.0.16
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.14
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.12
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.10
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.8
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.6
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.4
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.2
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.2.0.28
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.26
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.24
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.22
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.20
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.18
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.16
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.14
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.12
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.10
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.2.0.6
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.2.0.8
	netbsd-1-6-RELEASE-base:1.2
	pkgviews:1.2.0.4
	pkgviews-base:1.2
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2
	netbsd-1-5-PATCH001:1.2
	netbsd-1-5-RELEASE:1.1.1.1
	netbsd-1-4-PATCH003:1.1.1.1
	netbsd-1-4-PATCH002:1.1.1.1
	comdex-fall-1999:1.1.1.1
	netbsd-1-4-PATCH001:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.8
date	2017.11.26.09.11.03;	author spz;	state Exp;
branches;
next	1.7;
commitid	8qjd9ETyKueYEwgA;

1.7
date	2016.03.30.09.54.24;	author jperkin;	state Exp;
branches;
next	1.6;
commitid	Onnxpe2DDWEOnE0z;

1.6
date	2011.01.29.17.16.33;	author spz;	state Exp;
branches;
next	1.5;

1.5
date	2010.10.30.23.48.36;	author spz;	state Exp;
branches;
next	1.4;

1.4
date	2010.10.29.21.51.22;	author spz;	state Exp;
branches;
next	1.3;

1.3
date	2006.06.16.17.11.25;	author jlam;	state Exp;
branches;
next	1.2;

1.2
date	2001.03.27.11.53.18;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	99.06.08.17.51.26;	author bad;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.06.08.17.51.26;	author bad;	state Exp;
branches;
next	;


desc
@@


1.8
log
@enable fortifications
@
text
@$NetBSD: patch-aa,v 1.7 2016/03/30 09:54:24 jperkin Exp $

warp the Makefile template to fit into pkgsrc

add CFLAGS and LDFLAGS to the wrapper compilation so it'll pick up RELRO

--- Makefile.orig	2000-01-18 14:01:17.000000000 +0000
+++ Makefile
@@@@ -13,27 +13,29 @@@@
 #
  
 # Put the location of your Perl binary here:
-PERL = /bin/perl
+PERL = @@PERL@@
 
 # What do you call your C compiler?
 CC = cc
  
 # Where do you want Majordomo to be installed?  This CANNOT be the
 # current directory (where you unpacked the distribution)
-W_HOME = /usr/test/majordomo-$(VERSION)
+W_HOME = @@PREFIX@@/libexec/majordomo
+HOME = @@HOME@@
  
 # Where do you want man pages to be installed?
-MAN = $(W_HOME)/man
+MAN = @@PREFIX@@/${PKGMANDIR}
  
 # You need to have or create a user and group which majordomo will run as.
 # Enter the numeric UID and GID (not their names!) here:
-W_USER = 123
-W_GROUP = 45
+W_USER = @@UID@@
+W_GROUP = @@GID@@
 
 # These set the permissions for all installed files and executables (except
 # the wrapper), respectively.  Some sites may wish to make these more
 # lenient, or more restrictive.
-FILE_MODE = 644
+CF_MODE = 664
+MAN_MODE = 444
 EXEC_MODE = 755
 HOME_MODE = 751
 
@@@@ -41,8 +43,8 @@@@ HOME_MODE = 751
 # BSDI or other 4.4-based BSD, Linux) use the following four lines.  Do not
 # change these values!
 WRAPPER_OWNER = root
-WRAPPER_GROUP = $(W_GROUP)
-WRAPPER_MODE = 4755
+WRAPPER_GROUP = $(W_MAJORDOMO_GROUP)
+WRAPPER_MODE = 4555
 POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GID=$(W_GROUP)
 # Otherwise, if your system is NOT POSIX (e.g. SunOS 4.x, SGI Irix 4,
 # HP DomainOS) then comment out the above four lines and uncomment
@@@@ -62,11 +64,14 @@@@ POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GI
 # parent process, and without the leading "W_" in the variable names) gets
 # passed to processes run by "wrapper"
 W_SHELL = /bin/sh
-W_PATH = /bin:/usr/bin:/usr/ucb
-W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf
+W_PATH = /bin:/usr/bin
+W_MAJORDOMO_CF = @@MAJORDOMO_CF@@
+
+W_MAJORDOMO_USER = @@MAJORDOMO_USER@@
+W_MAJORDOMO_GROUP = @@MAJORDOMO_GROUP@@
 
 # A directory for temp files..
-TMPDIR = /usr/tmp
+TMPDIR = @@TMPDIR@@
 
 #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
 
@@@@ -76,8 +81,9 @@@@ VERSION =	1.94.5
 SHELL = /bin/sh
 
 WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
-	-DHOME=\"HOME=$(W_HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
+	-DHOME=\"HOME=$(HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
 	-DMAJORDOMO_CF=\"MAJORDOMO_CF=$(W_MAJORDOMO_CF)\"      \
+	-DMAJORDOMO_USER=\"$(W_MAJORDOMO_USER)\"      \
 	$(POSIX)
 
 INSTALL = ./install.sh
@@@@ -94,7 +100,7 @@@@ BIN = 		bounce-remind config_parse.pl ma
 		majordomo_version.pl request-answer resend \
 		shlock.pl config-test archive2.pl digest
 
-INSTALL_FLAGS = -O $(W_USER) -g $(W_GROUP)
+INSTALL_FLAGS = -O root -g $(W_MAJORDOMO_GROUP)
 
 default: 
 	@@echo "make what?"
@@@@ -118,12 +124,12 @@@@ install: wrapper install-scripts install
 
 install-wrapper: wrapper
 	$(INSTALL) -o $(WRAPPER_OWNER) -g $(WRAPPER_GROUP) \
-		-m $(WRAPPER_MODE) wrapper $(W_HOME)/wrapper
+		-m $(WRAPPER_MODE) wrapper $(DESTDIR)$(W_HOME)/wrapper
 	@@echo ""
 	@@echo "To verify that all the permissions and etc are correct,"
 	@@echo "run the command"
 	@@echo ""
-	@@echo "	     cd $(W_HOME); ./wrapper config-test"
+	@@echo "	     cd $(DESTDIR)$(W_HOME); ./wrapper config-test"
 
 # fix where perl lives.
 # Create a tmp directory to stuff all the files in, so we 
@@@@ -143,30 +149,29 @@@@ config-scripts:
 
 
 install-scripts: config-scripts
-	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
-	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/bin
+	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(DESTDIR)$(W_HOME)
 
-	@@echo "Copying tools to $(W_HOME)/bin"
+	@@echo "Copying tools to $(DESTDIR)@@PREFIX@@/bin"
 
 	@@for file in $(BINBIN); do \
 		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-			$(TMP)/$$file $(W_HOME)/bin/$$file; \
+			$(TMP)/$$file $(DESTDIR)@@PREFIX@@/bin/$$file; \
 	done
 
-	@@echo "Copying Majordomo files to $(W_HOME)"
+	@@echo "Copying Majordomo files to $(DESTDIR)$(W_HOME)"
 
 	@@for file in $(BIN); do \
 		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-			$(TMP)/$$file $(W_HOME)/$$file; \
+			$(TMP)/$$file $(DESTDIR)$(W_HOME)/$$file; \
 	done
 
-	@@echo "Copying archiving and other tools to $(W_HOME)/Tools"
+	@@echo "Copying archiving and other tools to $(DESTDIR)$(W_HOME)/Tools"
 
-	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/Tools
+	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(DESTDIR)$(W_HOME)/Tools
 
 	@@for file in $(TOOLS); do \
 		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-			$(TMP)/$$file $(W_HOME)/Tools/$$file; \
+			$(TMP)/$$file $(DESTDIR)$(W_HOME)/Tools/$$file; \
 	done
 
 	@@rm -rf $(TMP)	
@@@@ -177,49 +182,43 @@@@ install-scripts: config-scripts
 # all cases, the sample.cf file must be installed so that config-test will
 # be able to check for new variables.
 install-cf:
-	@@if [ ! -f $(W_HOME)/majordomo.cf ]; \
-	  then \
-	    if [ -f majordomo.cf ]; \
-	      then \
-		echo "Using majordomo.cf"; \
-	  	$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-			majordomo.cf $(W_HOME)/majordomo.cf; \
-	      else \
-		echo "Using sample.cf"; \
-		$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-			sample.cf $(W_HOME)/majordomo.cf; \
-	    fi; \
-	else \
-	   echo "Using installed majordomo.cf"; \
-	fi;
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		sample.cf $(W_HOME)
+	# @@if [ ! -f $(W_MAJORDOMO_CF) ]; \
+	#   then \
+	#     if [ -f majordomo.cf ]; \
+	#       then \
+	# 	echo "Using majordomo.cf"; \
+	#   	$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
+	# 		majordomo.cf $(DESTDIR)$(W_MAJORDOMO_CF); \
+	#       else \
+	# 	echo "Using sample.cf"; \
+	# 	$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
+	# 		sample.cf $(DESTDIR)$(W_MAJORDOMO_CF); \
+	#     fi; \
+	# else \
+	#    echo "Using installed majordomo.cf"; \
+	# fi;
+	@@$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
+		sample.cf $(DESTDIR)$(W_HOME)
 
 install-man:
 	@@echo "Installing manual pages in $(MAN)"
-	@@$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-		. $(MAN)
-	@@$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-		. $(MAN)/man1
-	@@$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
-		. $(MAN)/man8
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/approve.1 $(MAN)/man1/approve.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/digest.1 $(MAN)/man1/digest.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/bounce.1 $(MAN)/man1/bounce.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/resend.1 $(MAN)/man1/resend.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-		Doc/man/resend.1 $(MAN)/man1/resend.1
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/approve.1 $(DESTDIR)$(MAN)/man1/approve.1
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/digest.1 $(DESTDIR)$(MAN)/man8/digest.8
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/bounce.1 $(DESTDIR)$(MAN)/man1/bounce.1
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/bounce-remind.1 $(DESTDIR)$(MAN)/man1/bounce-remind.1
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/resend.1 $(DESTDIR)$(MAN)/man1/resend.1
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/majordomo.8 $(DESTDIR)$(MAN)/man8/majordomo.8
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
+		Doc/man/resend.1 $(DESTDIR)$(MAN)/man1/resend.1
 
 wrapper: wrapper.c
-	$(CC)  $(WRAPPER_FLAGS) -o wrapper wrapper.c
+	$(CC)  $(CFLAGS) $(LDFLAGS) $(WRAPPER_FLAGS) -o wrapper wrapper.c
 
 clean:
 	rm -f  wrapper *~
@


1.7
log
@Use PKGMANDIR.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.6 2011/01/29 17:16:33 spz Exp $
d5 2
d148 1
a148 1
@@@@ -177,46 +182,40 @@@@ install-scripts: config-scripts
d225 5
a229 1
 	$(CC)  $(WRAPPER_FLAGS) -o wrapper wrapper.c
@


1.6
log
@stop majordomo from chowning /var/tmp to user majordom due to a superannuated
default in mk/defaults/mk.conf

remove the non-shared defaults and put in the setting that actually gets
used by more than one package (namely, MAJORDOMO_HOMEDIR)

don't make the majordom user own more than it actually needs to

make resend, archive, request-answer and medit honor the MAJORDOMO_CF
environment variable over the command line option, so that someone calling
these via the wrapper (which sets the environment variable) can't make
the majordom user execute random perl code by specifying it as config file.
Thanks to salo for finding this issue.
@
text
@d1 1
a1 1
$NetBSD$
d25 1
a25 1
+MAN = @@PREFIX@@/man
@


1.5
log
@make the wrapper use getpwnam to determine uid and gid of the majordomo user
adjust the Makefile to fit

package beautification and lint shutup (like eg comments for some patches)
@
text
@d43 1
a43 1
@@@@ -41,7 +43,7 @@@@ HOME_MODE = 751
d48 1
d50 1
a50 1
 WRAPPER_MODE = 4755
d53 1
d88 1
a88 1
+INSTALL_FLAGS = -O $(W_MAJORDOMO_USER) -g $(W_MAJORDOMO_GROUP)
@


1.4
log
@bring up the package to current pkgsrc standards, especially DESTDIR
and paths being used.
MAJORDOMO_HOMEDIR moves from /home/majordom to $VARBASE/majordomo, unless
overridden by the package builder
MAJORDOMO_CF is now ${PREFIX}/etc/majordomo/majordomo.cf
@
text
@d3 2
d43 10
a52 1
@@@@ -62,11 +64,11 @@@@ POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GI
d60 3
d70 1
a70 1
@@@@ -76,7 +78,7 @@@@ VERSION =	1.94.5
d77 1
d80 11
a90 1
@@@@ -118,12 +120,12 @@@@ install: wrapper install-scripts install
d105 1
a105 1
@@@@ -143,30 +145,29 @@@@ config-scripts:
d144 1
a144 1
@@@@ -177,46 +178,40 @@@@ install-scripts: config-scripts
@


1.3
log
@Modify (finally!) to use pkginstall framework.  Bump PKGREVISION to 2.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.2 2001/03/27 11:53:18 agc Exp $
d3 2
a4 2
--- Makefile.orig	Wed Aug 27 16:56:21 1997
+++ Makefile	Tue Mar 27 12:41:29 2001
d19 1
a19 1
+HOME = @@HOME@@/@@MAJORDOMO_USER@@
d41 1
a41 1
@@@@ -62,11 +64,11 @@@@
d48 1
a48 1
+W_MAJORDOMO_CF = @@HOME@@/@@MAJORDOMO_USER@@/majordomo.cf
d56 1
a56 1
@@@@ -76,7 +78,7 @@@@
d65 17
a81 1
@@@@ -144,13 +146,12 @@@@
d84 1
a84 1
 	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
d86 1
d89 1
a89 1
+	@@echo "Copying tools to @@PREFIX@@/bin"
d94 22
a115 1
+			$(TMP)/$$file @@PREFIX@@/bin/$$file; \
d118 2
a119 2
 	@@echo "Copying Majordomo files to $(W_HOME)"
@@@@ -177,45 +178,39 @@@@
d124 4
a127 5
+	@@if [ ! -f $(W_MAJORDOMO_CF) ]; \
 	  then \
 	    if [ -f majordomo.cf ]; \
 	      then \
 		echo "Using majordomo.cf"; \
d130 2
a131 4
+	  	$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
+			majordomo.cf $(W_MAJORDOMO_CF); \
 	      else \
 		echo "Using sample.cf"; \
d134 21
a154 7
+		$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
+			sample.cf $(W_MAJORDOMO_CF); \
 	    fi; \
 	else \
 	   echo "Using installed majordomo.cf"; \
 	fi;
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
d156 1
a156 1
 		sample.cf $(W_HOME)
d167 1
a167 2
+	@@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
 		Doc/man/approve.1 $(MAN)/man1/approve.1
d171 9
d181 1
a181 1
+		Doc/man/digest.1 $(MAN)/man8/digest.8
d183 3
a185 2
 		Doc/man/bounce.1 $(MAN)/man1/bounce.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
d187 1
a187 2
 		Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
d189 1
a189 2
 		Doc/man/resend.1 $(MAN)/man1/resend.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
d191 1
a191 2
 		Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
d193 1
a193 1
 		Doc/man/resend.1 $(MAN)/man1/resend.1
d196 1
@


1.2
log
@Move majordomo's digest man page to section 8, so that it doesn't
conflict with digest(1)'s manual page.  The majordomo digest command
lives in libexec, anyway.

Bump version to majordomo-1.94.4nb1

Addresses PR 12385, from Jun-ichiro itojun Hagino
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
d10 1
a10 1
+PERL = @@LOCALBASE@@/bin/perl
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
d3 4
a6 3
--- ./Makefile.orig	Wed Aug 27 09:56:21 1997
+++ ./Makefile	Tue Jun  8 10:59:33 1999
@@@@ -14,5 +14,5 @@@@
d13 2
a14 1
@@@@ -21,18 +21,20 @@@@
d40 3
a42 1
@@@@ -63,9 +65,9 @@@@
d55 3
a57 1
@@@@ -77,5 +79,5 @@@@
d64 3
a66 1
@@@@ -145,11 +147,10 @@@@
d80 3
a82 1
@@@@ -178,43 +179,37 @@@@
d121 2
d124 1
a124 2
 		Doc/man/digest.1 $(MAN)/man1/digest.1
-	@@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
d140 1
@


1.1.1.1
log
@Initial import of pkg for majordomo-1.94.4, the popular mailing list manager.

Packaged by Brook Milligan brook@@trillium.NMSU.Edu.
@
text
@@