Index: head/x11-toolkits/gnustep-gui/Makefile =================================================================== --- head/x11-toolkits/gnustep-gui/Makefile (revision 71837) +++ head/x11-toolkits/gnustep-gui/Makefile (revision 71838) @@ -1,111 +1,114 @@ # New ports collection makefile for: gnustep-gui # Date created: 19 April 2001 # Whom: Thomas Gellekum # # $FreeBSD$ # PORTNAME= gnustep-gui .if defined(GNUSTEP_GUI_DEVEL) PORTVERSION= 0.8.3 .else PORTVERSION= 0.7.6 .endif CATEGORIES= x11-toolkits .if defined(GNUSTEP_GUI_DEVEL) MASTER_SITES= ${MASTER_SITE_GNUSTEP} \ ftp://ftp.gnustep.org/pub/gnustep/%SUBDIR%/ MASTER_SITE_SUBDIR= core PKGNAMESUFFIX?= -devel .else MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= dinoex .endif MAINTAINER= dinoex@FreeBSD.org BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff .if defined(GNUSTEP_GUI_DEVEL) LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile .endif BREAKS_IF_PEDANTIC= yes .if defined(GNUSTEP_GUI_DEVEL) +EXTRA_PATCHES= ${FILESDIR}/extra-pa_unix_oss.c PLIST_SUB+= DEVEL="" PLIST_SUB+= NODEVEL="@comment " .else PLIST_SUB+= DEVEL="@comment " PLIST_SUB+= NODEVEL="" .endif .include .if ${OSVERSION} < 300000 BROKEN= "Sorry, this port does not work on FreeBSD-2.2.x" .endif PREFIX= ${LOCALBASE}/GNUstep GNU_CONFIGURE= yes CONFIGURE_TARGET= USE_GMAKE= yes MAKEFILE= MAKE_FLAGS+= OPTFLAG="${CFLAGS}" -MAKE_FLAGS+= ADDITIONAL_LIB_DIRS=/usr/local/lib to core/gui/Source/GNUmakefile.preamble +MAKE_FLAGS+= ADDITIONAL_LIB_DIRS=/usr/local/lib NO_MTREE= yes CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include EXTRA_FIX= ${WRKSRC}/Tools/gsnd/portaudio/pa_unix_oss/Makefile .if ${MACHINE_ARCH} == "i386" GNU_ARCH= ix86 .else GNU_ARCH= ${MACHINE_ARCH} .endif PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \ MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} COMBOLIBDIR= ${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu post-extract: .for file in config.guess config.sub install-sh @${CP} ${PREFIX}/System/Makefiles/${file} ${WRKSRC} .endfor +.if defined(GNUSTEP_GUI_DEVEL) pre-configure: @ ${MV} ${EXTRA_FIX} ${EXTRA_FIX}.sed ${SED} -e "s=-lphread=${PTHREAD_LIBS}=" -e "s;CFLAGS =;CFLAGS+=;" \ -e "s;-Wall;-Wall ${PTHREAD_CFLAGS:S=""==};" \ ${EXTRA_FIX}.sed > ${EXTRA_FIX} +.endif do-configure: @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ INSTALL_DATA="${INSTALL} -c" \ INSTALL_PROGRAM="${INSTALL} -c" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ ${CAT} ${CONFIGURE_LOG}; \ ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ ${FALSE}; \ fi) do-build: @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) do-install: @(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) test: @(cd ${WRKSRC}/Tools/gsnd/portaudio/pa_unix_oss && \ ${GMAKE} && ./patest) .include Property changes on: head/x11-toolkits/gnustep-gui/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c =================================================================== --- head/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c (revision 71837) +++ head/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c (nonexistent) @@ -1,14 +0,0 @@ ---- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig Wed Oct 2 05:34:54 2002 -+++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c Mon Dec 2 09:21:34 2002 -@@ -110,7 +110,11 @@ - #ifdef __linux__ - #include - #else -+#ifdef __FreeBSD__ -+#include -+#else - #include /* JH20010905 */ -+#endif - #endif - - #include "portaudio.h" Property changes on: head/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c =================================================================== --- head/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c (nonexistent) +++ head/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c (revision 71838) @@ -0,0 +1,14 @@ +--- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig Wed Oct 2 05:34:54 2002 ++++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c Mon Dec 2 09:21:34 2002 +@@ -110,7 +110,11 @@ + #ifdef __linux__ + #include + #else ++#ifdef __FreeBSD__ ++#include ++#else + #include /* JH20010905 */ ++#endif + #endif + + #include "portaudio.h" Property changes on: head/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property