From owner-svn-ports-all@FreeBSD.ORG Mon Nov 18 06:00:30 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24749F39; Mon, 18 Nov 2013 06:00:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE5B92F61; Mon, 18 Nov 2013 06:00:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAI60TKd048189; Mon, 18 Nov 2013 06:00:29 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAI60TTt048186; Mon, 18 Nov 2013 06:00:29 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201311180600.rAI60TTt048186@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 18 Nov 2013 06:00:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334146 - in head/games/cake: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 06:00:30 -0000 Author: danfe Date: Mon Nov 18 06:00:29 2013 New Revision: 334146 URL: http://svnweb.freebsd.org/changeset/ports/334146 Log: - Modernize LIB_DEPENDS syntax, sort the knobs - Stagify, cleanup patch-Makefile, drop MAKE_ARGS Modified: head/games/cake/Makefile head/games/cake/files/patch-Makefile Modified: head/games/cake/Makefile ============================================================================== --- head/games/cake/Makefile Mon Nov 18 05:53:34 2013 (r334145) +++ head/games/cake/Makefile Mon Nov 18 06:00:29 2013 (r334146) @@ -13,19 +13,18 @@ COMMENT= Quake3 map viewer (and powerful LICENSE= GPLv2 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_XORG= x11 xext xmu xt xi sm ice +USES= gmake USE_GL= glut +USE_XORG= x11 xext xmu xt xi sm ice +USE_ZIP= yes # Need to pass `-l', but PATCH_ARGS+= won't work because of PATCH_ARGS?= # in bsd.port.mk PATCH_ARGS= -d ${PATCH_WRKSRC} -N -s -E ${PATCH_STRIP} -l -USE_GMAKE= yes -USE_ZIP= yes ALL_TARGET= main -MAKE_ARGS+= CXX=${CXX} PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC= ${WRKDIR}/cake_src PLIST_FILES= bin/cake @@ -46,13 +45,7 @@ post-patch: .SILENT # Fix for GCC 4.x ${REINPLACE_CMD} -e 's/Mat3x2:://' ${WRKSRC}/cake/math.h -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/main ${PREFIX}/bin/cake - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${INSTALL_PROGRAM} ${WRKSRC}/main ${STAGEDIR}${PREFIX}/bin/cake .include Modified: head/games/cake/files/patch-Makefile ============================================================================== --- head/games/cake/files/patch-Makefile Mon Nov 18 05:53:34 2013 (r334145) +++ head/games/cake/files/patch-Makefile Mon Nov 18 06:00:29 2013 (r334146) @@ -8,12 +8,12 @@ -LDFLAGS += -L/usr/lib -L/usr/local/lib -lglut -lGLU -lGL -L/usr/X11R6/lib -lm -ldl -LDFLAGS += -lpthread -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63 -+INCLUDES = -I/usr/include -I$(LOCALBASE)/include ++INCLUDES = -I$(LOCALBASE)/include +CXX ?= g++ +CXXFLAGS += -Wall $(INCLUDES) + -+LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lglut -lGLU -lGL -+LDFLAGS += $(PTHREAD_LIBS) -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE ++LDFLAGS += -L$(LOCALBASE)/lib -lglut -lGLU -lGL ++LDFLAGS += -pthread -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE +#LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63 +LDFLAGS += -ljpeg