From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 14 17:50:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CAF116A402 for ; Fri, 14 Apr 2006 17:50:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9100C43D4C for ; Fri, 14 Apr 2006 17:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3EHoFZk071002 for ; Fri, 14 Apr 2006 17:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3EHoF2W071001; Fri, 14 Apr 2006 17:50:15 GMT (envelope-from gnats) Resent-Date: Fri, 14 Apr 2006 17:50:15 GMT Resent-Message-Id: <200604141750.k3EHoF2W071001@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Kozlov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DE8016A402 for ; Fri, 14 Apr 2006 17:44:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02C8643D45 for ; Fri, 14 Apr 2006 17:44:44 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k3EHifO7008786 for ; Fri, 14 Apr 2006 17:44:41 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k3EHifhe008758; Fri, 14 Apr 2006 17:44:41 GMT (envelope-from nobody) Message-Id: <200604141744.k3EHifhe008758@www.freebsd.org> Date: Fri, 14 Apr 2006 17:44:41 GMT From: Alex Kozlov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/95757: [patch] emulators/wine add USE_LDCONFIG mechanism X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2006 17:50:16 -0000 >Number: 95757 >Category: ports >Synopsis: [patch] emulators/wine add USE_LDCONFIG mechanism >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Apr 14 17:50:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: FreeBSD 6.1-RC >Organization: private >Environment: FreeBSD localhost 6.1-RC FreeBSD 6.1-RC i386 >Description: Add USE_LDCONFIG in wine port >How-To-Repeat: Apply the patch. >Fix: rm files/wine.sh.in diff -u Makefile.orig Makefile --- Makefile.orig Fri Apr 14 15:15:12 2006 +++ Makefile Fri Apr 14 16:15:10 2006 @@ -8,6 +8,7 @@ PORTNAME= wine PORTVERSION= 0.9.12 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ @@ -25,6 +26,7 @@ CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/wine +USE_LDCONFIG= ${PREFIX}/lib/wine MAN1= widl.1 wine.1 winebuild.1 winedbg.1 winedump.1 winegcc.1 \ winemaker.1 wineserver.1 wmc.1 wrc.1 ONLY_FOR_ARCHS= i386 @@ -34,10 +36,11 @@ USE_GL= yes USE_XPM= yes -SUB_FILES= pkg-message wine.sh +SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message .include +.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" .if ${OSVERSION} < 503000 IGNORE= fails to work on versions of FreeBSD before 5.3 (due to problems with threading support) @@ -46,8 +49,7 @@ pre-build: cd ${WRKSRC} && make depend -post-install: - -@${MKDIR} ${PREFIX}/etc/rc.d +post-install: install-ldconfig-file ${RM} ${PREFIX}/man/man1/wineg++.1 .if !defined(NOPORTDOCS) -@${MKDIR} ${DOCSDIR} @@ -60,7 +62,6 @@ ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif @${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine - @${INSTALL_SCRIPT} ${WRKDIR}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh @${ECHO} @${CAT} ${PKGMESSAGE} diff -u pkg-plist.orig pkg-plist --- pkg-plist.orig Fri Apr 14 16:11:58 2006 +++ pkg-plist Fri Apr 14 16:12:10 2006 @@ -30,7 +30,6 @@ bin/winhelp bin/wmc bin/wrc -etc/rc.d/000.wine.sh include/wine/debug.h include/wine/exception.h include/wine/itss.h >Release-Note: >Audit-Trail: >Unformatted: