From nobody Fri Jan 12 22:46:59 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TBc9J4l0Nz56Z03; Fri, 12 Jan 2024 22:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TBc9J27jpz4qHd; Fri, 12 Jan 2024 22:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705099620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPTeokRC79NMd08WwN6MH0wWnqP9NJpQ76nqiSF4leE=; b=L/F6QjnCL1Lqkb0qiHui7VJbaS5JN9PBogkenalAYC8G6aA8rHt55RrlFy21+sKHWaPLCQ rIPDoOH+6gci69PrRBvgoGlmG44CMlG8mAYXe836h7vyP4xZS2CSnXbl8RxOrjS51fTrJN cmmo4rqsoCQNYezRMvigdKJ4b4+859t0qMhPFLyazndVc0Aa03Bpp9pdBAbB9emajTV/vI dhkqeFPNcP5ZJaBcoxsQrdDhhDo/NSwIXmuu1L50BtpVFh5kN4L5gVElYntGOPn0wHUO4E 7YQcQgviZqYNQxgdqTF2FpRU0FIqPAV7eIrgWqfJi82gnJy8IS+DPpaKDSE9sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705099620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPTeokRC79NMd08WwN6MH0wWnqP9NJpQ76nqiSF4leE=; b=OC38MhTZdtuKpzLe/gbAQVtlNcPgoJ7xavo7Llsm4ilIL6VP2v9fmGjwbUNCI6rByWu58L 4YFxqp6m8gQQGMJqDlMByBde7G+pEuO97aVbkJnSi6LUYToTkQ29B7u3qLMT1q4/FHYcZt f0nYAcCuWw8d446IazFN+UtpnDisgWkr5uacU3tKd0m55VWyfMmR0z0kcMcxf8I1I4VdWJ nOYUZtDzzRuwo3D+BlD2BmbhbkupbiE+sRZiBgjQBf+shv6QPCR4Kmyl1fKV1/k9chQyCI PGOGr/jdq78tpPy1OCPuWCq1tbCVCBUK2K4cmjU6aGeeRNoVxssSQTND9FACnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705099620; a=rsa-sha256; cv=none; b=bWn7e+ecLD8OhaDaZXEjb029bOtLyd9VDZFolppMy4dahHp+ZK+u1oGoH96IbW4cqxotos uA5JXUKCGp+BpPKMjwtjZoaTmUZIgJZUf8e/UulvhrHm1zXO5u7BUlI65DsVGnuC8RXO+2 VyuyCUWRLjtWdWwxt2UcwuPbNujkZELNDre7wKCk6gpT4j4v7zMJ+8aTDX7FqGdEQeMnw3 iO0gcgm5IBh3oFsdpzGgABvk8tWgINBfVKy5aAN9vP9IdfqQdtCh3TCU+PIh0SVzbgeB7O fdHY8M3v9JMd2CxBDeg9wGnrcvBlCt5BkTSw/iwZaYGqRfKjX6OiXIdQC5zYTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TBc9J07G9z1Kc9; Fri, 12 Jan 2024 22:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CMkxW3092043; Fri, 12 Jan 2024 22:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CMkxN6092040; Fri, 12 Jan 2024 22:46:59 GMT (envelope-from git) Date: Fri, 12 Jan 2024 22:46:59 GMT Message-Id: <202401122246.40CMkxN6092040@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: d64a3318ae18 - main - databases/freetds-devel: Refactor List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d64a3318ae18425f85039cac140b800888d9f423 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=d64a3318ae18425f85039cac140b800888d9f423 commit d64a3318ae18425f85039cac140b800888d9f423 Author: Muhammad Moinur Rahman AuthorDate: 2024-01-12 12:05:11 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-12 22:37:13 +0000 databases/freetds-devel: Refactor - Skip USES=autoreconf as we have configure scripts - Sanitize MAN path --- databases/freetds-devel/Makefile | 22 ++++++++++++---------- .../freetds-devel/files/patch-src_tds_Makefile.in | 11 ----------- databases/freetds-devel/pkg-plist | 18 +++++++++--------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index e1de65e8baad..3435db30efea 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= freetds PORTVERSION= 1.4.144 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= https://www.freetds.org/files/current/ \ @@ -13,16 +14,18 @@ WWW= http://www.freetds.org/ LICENSE= LGPL20 -USES= autoreconf compiler:c11 cpe gettext-tools gmake iconv \ +USES= compiler:c11 cpe gettext-tools gmake iconv \ libtool:keepla localbase:ldflags pkgconfig tar:bzip2 USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --docdir=${DOCSDIR} \ +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --prefix=${PREFIX} \ + --docdir=${DOCSDIR} \ --enable-msdblib \ --enable-sybase-compat \ --sysconfdir=${ETCDIR} \ - --with-tdsver=${TDS_VER} + --with-tdsver=${TDS_VER} \ + --mandir=${PREFIX}/share/man INSTALL_TARGET= install-strip @@ -69,15 +72,14 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \ ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|/pool.conf|/pool.conf.sample|g ; \ - s| common.h||g ; \ - s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \ - s|%%ICONV_LIB%%|${ICONV_LIB}|' + @${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \ + ${WRKSRC}/src/pool/Makefile.in @${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \ - s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.am + s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \ s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ ${ICONV_LIB}|g' \ + ${WRKSRC}/src/tds/Makefile.in post-install: ${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample diff --git a/databases/freetds-devel/files/patch-src_tds_Makefile.in b/databases/freetds-devel/files/patch-src_tds_Makefile.in deleted file mode 100644 index ee7e9d3d1888..000000000000 --- a/databases/freetds-devel/files/patch-src_tds_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tds/Makefile.in.orig 2015-05-24 09:01:31 UTC -+++ src/tds/Makefile.in -@@ -297,7 +297,7 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@ - LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ - LIBICONV = @LIBICONV@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ %%ICONV_LIB%% - LIBTOOL = @LIBTOOL@ - LIPO = @LIPO@ - LN_S = @LN_S@ diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist index a0980bcb75a6..b0eb285899d0 100644 --- a/databases/freetds-devel/pkg-plist +++ b/databases/freetds-devel/pkg-plist @@ -21,15 +21,15 @@ include/syberror.h include/sybfront.h include/tds_sysdep_public.h include/odbcss.h -man/man1/datacopy.1.gz -man/man1/freebcp.1.gz -man/man1/tsql.1.gz -man/man1/bsqldb.1.gz -man/man1/bsqlodbc.1.gz -man/man1/defncopy.1.gz -man/man1/fisql.1.gz -man/man1/osql.1.gz -man/man5/freetds.conf.5.gz +share/man/man1/datacopy.1.gz +share/man/man1/freebcp.1.gz +share/man/man1/tsql.1.gz +share/man/man1/bsqldb.1.gz +share/man/man1/bsqlodbc.1.gz +share/man/man1/defncopy.1.gz +share/man/man1/fisql.1.gz +share/man/man1/osql.1.gz +share/man/man5/freetds.conf.5.gz lib/libct.a lib/libct.la lib/libct.so