pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Take advantage of mk/djbware.mk.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8152b59d66a0
branches:  trunk
changeset: 491321:8152b59d66a0
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Mar 23 00:51:09 2005 +0000

description:
Take advantage of mk/djbware.mk.

diffstat:

 databases/cdb/Makefile           |  15 +++------------
 devel/bglibs/Makefile            |  12 +++++-------
 mail/dot-forward/Makefile        |  15 ++++-----------
 mail/ezmlm-idx/Makefile          |   7 +++----
 mail/ezmlm-idx/options.mk        |  24 +++++++++++++++++-------
 mail/ezmlm/Makefile              |   7 +++----
 mail/ezmlm/Makefile.common       |  13 +++----------
 mail/fastforward/Makefile        |  15 ++++-----------
 mail/mess822/Makefile            |  16 ++++------------
 mail/qmail-conf/Makefile         |  13 ++++---------
 mail/qmail-qfilter/Makefile      |  21 ++++++++++-----------
 mail/qmail/Makefile              |  15 ++++-----------
 mail/qmailanalog/Makefile        |  16 ++++------------
 mail/qtools/Makefile             |  14 ++++----------
 mail/queue-fix/Makefile          |   9 +++------
 mail/safecat/Makefile            |  13 +++++--------
 math/djbfft/Makefile             |  17 ++++++-----------
 net/djbdns/Makefile              |  15 +++------------
 net/publicfile/Makefile          |  16 ++++------------
 net/ucspi-tcp/Makefile           |  15 +++------------
 sysutils/checkpassword/Makefile  |  15 +++------------
 sysutils/daemontools/Makefile    |  13 ++++---------
 sysutils/service-config/Makefile |  14 ++++----------
 23 files changed, 107 insertions(+), 223 deletions(-)

diffs (truncated from 766 to 300 lines):

diff -r 1c44851255ec -r 8152b59d66a0 databases/cdb/Makefile
--- a/databases/cdb/Makefile    Wed Mar 23 00:50:06 2005 +0000
+++ b/databases/cdb/Makefile    Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/13 03:25:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/23 00:51:09 schmonz Exp $
 
 DISTNAME=      cdb-0.75
 CATEGORIES=    databases
@@ -8,26 +8,17 @@
 HOMEPAGE=      http://cr.yp.to/cdb.html
 COMMENT=       Creates and reads constant databases
 
-RESTRICTED=    "modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+DJB_RESTRICTED=        YES
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=        yes
 
-BUILD_TARGET=  it
-INSTALL_TARGET=        setup check
-
 INSTALLATION_DIRS=     bin include lib
 
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/cdb.h ${PREFIX}/include
        ${INSTALL_DATA} ${WRKSRC}/cdb.a ${PREFIX}/lib/libcdb.a
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 devel/bglibs/Makefile
--- a/devel/bglibs/Makefile     Wed Mar 23 00:50:06 2005 +0000
+++ b/devel/bglibs/Makefile     Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/13 03:25:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=              bglibs-1.019
@@ -11,12 +11,10 @@
 
 USE_BUILDLINK3=                yes
 
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+BUILD_TARGET=          all
 
-do-install:
-       cd ${WRKSRC} && ./installer && ./instcheck
+DJB_RESTRICTED=                NO
+BGWARE_INSTALLER=      YES
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 mail/dot-forward/Makefile
--- a/mail/dot-forward/Makefile Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/dot-forward/Makefile Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=              dot-forward-0.71
@@ -14,16 +14,9 @@
 
 USE_BUILDLINK3=                yes
 
-BUILD_TARGET=          it install instcheck
-INSTALL_TARGET=                setup check
-
-RESTRICTED=            "modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
+DJB_BUILD_TARGETS=     install instcheck
 
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_RESTRICTED=                YES
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 mail/ezmlm-idx/Makefile
--- a/mail/ezmlm-idx/Makefile   Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/ezmlm-idx/Makefile   Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/13 03:33:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.18 2005/03/23 00:51:09 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -20,9 +20,7 @@
 USE_BUILDLINK3=                yes
 
 # ezmlm-idx is a modification of the ezmlm source.
-RESTRICTED=            "modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
+DJB_RESTRICTED=                YES
 
 USE_PKGINSTALL=                YES
 
@@ -55,4 +53,5 @@
        ${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${EGDIR}/ezmlmglrc
        ${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${EGDIR}/ezmlmsubrc
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 mail/ezmlm-idx/options.mk
--- a/mail/ezmlm-idx/options.mk Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/ezmlm-idx/options.mk Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2004/12/21 03:42:25 schmonz Exp $
+# $NetBSD: options.mk,v 1.6 2005/03/23 00:51:09 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ezmlm-idx
 PKG_SUPPORTED_OPTIONS= mysql pgsql
@@ -20,9 +20,14 @@
 .  include "../../mk/mysql.buildlink3.mk"
 .  if !target(post-configure)
 post-configure:
-       ${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql > ${WRKSRC}/sub_mysql/conf-sqlcc
-       ${ECHO} -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient > ${WRKSRC}/sub_mysql/conf-sqlld
-       ${ECHO} mysql > ${WRKSRC}/conf-sub
+       cd ${WRKSRC};                                                   \
+       ${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql        \
+               > sub_mysql/conf-sqlcc;                                 \
+       ${ECHO} -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql            \
+               -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql        \
+               -lmysqlclient                                           \
+               > sub_mysql/conf-sqlld;                                 \
+       ${ECHO} mysql > conf-sub
 .  else
 PKG_FAIL_REASON+=      "mysql: can't define post-configure target"
 .  endif
@@ -35,9 +40,14 @@
 .  include "../../mk/pgsql.buildlink3.mk"
 .  if !target(post-configure)
 post-configure:
-       ${ECHO} -I${PGSQL_PREFIX}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc
-       ${ECHO} -L${PGSQL_PREFIX}/lib -Wl,-R${PGSQL_PREFIX}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld
-       ${ECHO} pgsql > ${WRKSRC}/conf-sub
+       cd ${WRKSRC};                                                   \
+       ${ECHO} -I${PGSQL_PREFIX}/include                               \
+               > sub_pgsql/conf-sqlcc;                                 \
+       ${ECHO} -L${PGSQL_PREFIX}/lib                                   \
+               -Wl,-R${PGSQL_PREFIX}/lib                               \
+               -lpq                                                    \
+               > sub_pgsql/conf-sqlld;                                 \
+       ${ECHO} pgsql > conf-sub
 .  else
 PKG_FAIL_REASON+=      "pgsql: can't define post-configure target"
 .  endif
diff -r 1c44851255ec -r 8152b59d66a0 mail/ezmlm/Makefile
--- a/mail/ezmlm/Makefile       Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/ezmlm/Makefile       Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/01/08 17:54:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/23 00:51:09 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -18,13 +18,12 @@
 
 # We change conf-bin and conf-man from the default "/usr/local"
 # and don't provide compatibility symlinks.
-RESTRICTED=            "modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
+DJB_RESTRICTED=                YES
 
 INSTALLATION_DIRS=     bin man man/man1 man/man5 man/cat1 man/cat5
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 mail/ezmlm/Makefile.common
--- a/mail/ezmlm/Makefile.common        Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/ezmlm/Makefile.common        Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/03/23 00:51:09 schmonz Exp $
 #
 
 EZMLM_VERS=    ezmlm-0.53
@@ -11,12 +11,5 @@
 
 PLIST_SRC=     ../../mail/ezmlm/PLIST.common
 
-BUILD_TARGET=  it man install
-INSTALL_TARGET=        setup
-
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       ${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
-       ${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
-       ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_BUILD_TARGETS=     man install
+INSTALL_TARGET=                setup
diff -r 1c44851255ec -r 8152b59d66a0 mail/fastforward/Makefile
--- a/mail/fastforward/Makefile Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/fastforward/Makefile Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=              fastforward-0.51
@@ -16,16 +16,9 @@
 
 USE_BUILDLINK3=                yes
 
-BUILD_TARGET=          it install instcheck
-INSTALL_TARGET=                setup check
-
-RESTRICTED=            "modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
+DJB_BUILD_TARGETS=     install instcheck
 
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
+DJB_RESTRICTED=                YES
 
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 mail/mess822/Makefile
--- a/mail/mess822/Makefile     Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/mess822/Makefile     Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=              mess822-0.58
@@ -15,9 +15,7 @@
 # provide compatibilbity symlinks. We also patch hier.c to respect
 # PKG_SYSCONFDIR and set reasonable modes on directories under
 # ${PREFIX}, and patch strerr_sys.c to build on Mac OS X.
-RESTRICTED=            "modified source and binaries may not be distributed"
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
+DJB_RESTRICTED=                YES
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
@@ -29,16 +27,10 @@
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}
 SUPPORT_FILES+=                ${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 
-BUILD_TARGET=          it install instcheck
-INSTALL_TARGET=                setup check
+DJB_BUILD_TARGETS=     install instcheck
 
 INSTALLATION_DIRS=     bin include lib man man/cat1 man/cat3 man/cat5 man/cat8
 INSTALLATION_DIRS+=    man/man1 man/man3 man/man5 man/man8 share/examples/mess822
 
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-       ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
-
+.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1c44851255ec -r 8152b59d66a0 mail/qmail-conf/Makefile
--- a/mail/qmail-conf/Makefile  Wed Mar 23 00:50:06 2005 +0000
+++ b/mail/qmail-conf/Makefile  Wed Mar 23 00:51:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/03/13 03:25:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/23 00:51:09 schmonz Exp $
 #
 
 DISTNAME=              qmail-conf-0.60
@@ -20,16 +20,11 @@
 
 USE_BUILDLINK3=                yes
 
-BUILD_TARGET=          it
-INSTALL_TARGET=        setup check
-
-do-configure:
-       ${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
-       ${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld



Home | Main Index | Thread Index | Old Index