commit 24587d39df0893249ec70e21ad4c1ae6384587f1
from: Martijn van Duren <martijn@openbsd.org>
date: Wed Jun 02 10:48:50 2021 UTC

Shuffle some deckchairs

commit - 0dcc8bb7de138b2bab243c6a1b4ea9e2690967fe
commit + 24587d39df0893249ec70e21ad4c1ae6384587f1
blob - 8c02fd9a2c317c95309bc937aa7e6bbe26e21d69
blob + 857f4a05641f1a1284bc57b3f37dde01c72d4b69
--- Makefile
+++ Makefile
@@ -1,14 +1,14 @@
-LIB=	opensmtpd
+LIB=		opensmtpd
 
-LOCALBASE?= /usr/local/
+LOCALBASE?=	/usr/local/
 
-SRCS=	opensmtpd.c iobuf.c ioev.c
-HDRS=	opensmtpd.h
-MAN=	osmtpd_run.3
-LIBDIR=	${LOCALBASE}/lib/
-MANDIR=	${LOCALBASE}/man/man
-LDADD=	-levent
-DPADD=	${EVENT}
+SRCS=		opensmtpd.c iobuf.c ioev.c
+HDRS=		opensmtpd.h
+MAN=		osmtpd_run.3
+LIBDIR=		${LOCALBASE}/lib/
+MANDIR=		${LOCALBASE}/man/man
+LDADD=		-levent
+DPADD=		${EVENT}
 
 CFLAGS+=	-Wall -I${.CURDIR} -I${.CURDIR}/openbsd-compat
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes
blob - de4da951e102e02df1e43265ee4991e1106e7e5b
blob + b4bcaef6044a0fc185d6330d5d85027a9a8bc388
--- Makefile.gnu
+++ Makefile.gnu
@@ -1,24 +1,17 @@
-LOCALBASE?= /usr
+LIB=		opensmtpd
 
-LIB=	opensmtpd
+LOCALBASE?=	/usr
 
-SRCS=	opensmtpd.c iobuf.c ioev.c
-HDRS=	opensmtpd.h
-MAN=	osmtpd_run.3
+SRCS=		opensmtpd.c iobuf.c ioev.c
+HDRS=		opensmtpd.h
+MAN=		osmtpd_run.3
 LIBDIR?=	${LOCALBASE}/lib/
 MANDIR?=	${LOCALBASE}/share/man/man3
+LDLIBS+=	-levent
 
-BINOWN?=	root
-BINGRP?=	root
-LIBPERM?=	755
-MANOWN?=	root
-MANGRP?=	root
-MANPERM?=	644
-
 mkfile_path := ${abspath ${lastword ${MAKEFILE_LIST}}}
 CURDIR := ${dir ${mkfile_path}}
 
-CFLAGS+=	-fPIC
 CFLAGS+=	-I${CURDIR} -I${CURDIR}/openbsd-compat/
 CFLAGS+=	-Wall
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes
@@ -26,16 +19,25 @@ CFLAGS+=	-Wmissing-declarations
 CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
 CFLAGS+=	-Wsign-compare
 
-LDLIBS+=	-levent
-
-INSTALL?=	install
-LINK?=		ln
-
 CLEANFILES= ${VERSION_SCRIPT}
 
 VERSION_SCRIPT=	Symbols.map
 SYMBOL_LIST=	${CURDIR}/Symbols.list
 
+includes:
+	@cd ${CURDIR}; for i in ${HDRS}; do \
+	    j="cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
+	    ${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m 444 $$i\
+		${DESTDIR}${LOCALBASE}/include/$$i"; \
+	    echo $$j; \
+	    eval "$$j"; \
+	done;
+
+${VERSION_SCRIPT}: ${SYMBOL_LIST}
+	{ printf '{\n\tglobal:\n'; \
+	  sed '/^[._a-zA-Z]/s/$$/;/; s/^/		/' ${SYMBOL_LIST}; \
+	  printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@
+
 # Defines for OpenBSD-specific interfaces
 # Add a OS-specific defines here.
 NEED_EXPLICIT_BZERO?=	0
@@ -47,22 +49,24 @@ NEED_STRTONUM?=		1
 
 MANFORMAT?=		mangz
 
+INSTALL?=	install
+LINK?=		ln
+
+BINOWN?=	root
+BINGRP?=	root
+LIBPERM?=	755
+MANOWN?=	root
+MANGRP?=	root
+MANPERM?=	644
+
 include ${CURDIR}/shlib_version
 BASE_LIB=lib${LIB}.so
 TARGET_LIB=lib${LIB}.so.${major}.${minor}.0
 SONAME_LIB=lib${LIB}.so.${major}
 
+CFLAGS+=	-fPIC
 LDFLAGS+=	-shared -Wl,-soname=${SONAME_LIB}
 
-includes:
-	@cd ${CURDIR}; for i in ${HDRS}; do \
-	    j="cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
-	    ${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m 444 $$i\
-		${DESTDIR}${LOCALBASE}/include/$$i"; \
-	    echo $$j; \
-	    eval "$$j"; \
-	done;
-
 ifeq (${MANFORMAT}, mangz)
 TARGET_MAN=		${MAN}.gz
 CLEANFILES+=		${TARGET_MAN}
@@ -120,11 +124,6 @@ endif
 
 OBJS=		${notdir ${SRCS:.c=.o}}
 
-${VERSION_SCRIPT}: ${SYMBOL_LIST}
-	{ printf '{\n\tglobal:\n'; \
-	  sed '/^[._a-zA-Z]/s/$$/;/; s/^/		/' ${SYMBOL_LIST}; \
-	  printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@
-
 ifdef VERSION_SCRIPT
 ${TARGET_LIB}: ${VERSION_SCRIPT}
 LDFLAGS+=	-Wl,--version-script=${VERSION_SCRIPT}