Index: devel/gnustep-make/Makefile =================================================================== --- devel/gnustep-make/Makefile (revision 383498) +++ devel/gnustep-make/Makefile (working copy) @@ -3,10 +3,9 @@ PORTNAME= gnustep-make PORTVERSION= 2.6.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnustep -MASTER_SITES= ${MASTER_SITE_GNUSTEP} -MASTER_SITE_SUBDIR= core +MASTER_SITES= GNUSTEP/core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep makefile package @@ -13,7 +12,7 @@ LICENSE= GPLv3 -USE_GNUSTEP= yes +USES= gnustep GNU_CONFIGURE= yes MAKE_FLAGS= OPTFLAG="${CFLAGS}" @@ -22,14 +21,8 @@ CONFIGURE_ARGS+= --with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf CONFIGURE_ARGS+= --with-layout=gnustep CONFIGURE_ARGS+= --enable-objc-nonfragile-abi --enable-native-objc-exceptions -LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX} -LIB_DEPENDS+= libobjc.so:${PORTSDIR}/lang/libobjc2 -post-patch: - ${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \ - ${WRKSRC}/configure - post-install: ${LN} -s Library/Makefiles ${STAGEDIR}${GNUSTEP_PREFIX}/System/ -${MKDIR} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Applications Index: devel/gnustep-make/files/GNUstep.conf =================================================================== --- devel/gnustep-make/files/GNUstep.conf (revision 0) +++ devel/gnustep-make/files/GNUstep.conf (working copy) @@ -0,0 +1,6 @@ +# This file is used here, when the ports +# are building. It tells GNUstep tools +# to use the source directory instead of +# the home directory to store temporary +# files, i.e. plmerge. +GNUSTEP_USER_DEFAULTS_DIR=/:INTERNAL: Property changes on: devel/gnustep-make/files/GNUstep.conf ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/gnustep-make/pkg-descr =================================================================== --- devel/gnustep-make/pkg-descr (revision 383498) +++ devel/gnustep-make/pkg-descr (working copy) @@ -6,6 +6,4 @@ Please contact the GNUstep maintainers at in case of questions and help offers. -LICENSE: GPL3 - WWW: http://www.gnustep.org/ Index: lang/gnustep-base/Makefile =================================================================== --- lang/gnustep-base/Makefile (revision 383498) +++ lang/gnustep-base/Makefile (working copy) @@ -5,8 +5,7 @@ PORTVERSION= 1.24.6 PORTREVISION= 6 CATEGORIES= lang devel gnustep -MASTER_SITES= ${MASTER_SITE_GNUSTEP} -MASTER_SITE_SUBDIR= core +MASTER_SITES= GNUSTEP/core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep Foundation library @@ -20,10 +19,8 @@ NOZEROCONF_DESC= Disable Zeroconf (Bonjour) support AVAHI_DESC?= Zeroconf via Avahi (preferred) -MDNS_DESC?= Zeroconf via Apple's mDNSResponder +MDNS_DESC?= Zeroconf via mDNSResponder -.include - LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 LIB_DEPENDS+= libxslt.so:${PORTSDIR}/textproc/libxslt @@ -30,33 +27,27 @@ LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls LIB_DEPENDS+= libicuuc.so:${PORTSDIR}/devel/icu -LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2 LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt -USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs --disable-openssl --enable-tls \ --with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls"\ --disable-mixedabi CONFIGURE_ENV+= OBJCFLAGS='-fobjc-runtime=gnustep-1.7 -fblocks' -USE_GNUSTEP= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} -USES= pkgconfig iconv +USES= pkgconfig iconv gnustep +USE_GNUSTEP= build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} MAKE_FLAGS= OPTFLAG="${CFLAGS}" MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml -DHAVE_DLADDR=1 -BREAKS_IF_PEDANTIC= yes -PLIST_SUB+= LOCALBASE=${LOCALBASE} ETCDIR= ${LOCALBASE}/etc STAGEHEADER= ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Headers PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} +.include + .if ${PORT_OPTIONS:MAVAHI} CONFIGURE_ARGS+= --with-zeroconf-api=avahi LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app @@ -67,8 +58,6 @@ CONFIGURE_ARGS+= --disable-zeroconf .endif -PATH:= ${PREFIX}/System/Tools:${PATH} - post-extract: @${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/|" \ ${WRKSRC}/configure Index: lang/gnustep-base/pkg-descr =================================================================== --- lang/gnustep-base/pkg-descr (revision 383498) +++ lang/gnustep-base/pkg-descr (working copy) @@ -7,7 +7,4 @@ Please contact the GNUstep maintainers at in case of questions and offers of help. -LICENSE: LGPL2 or later (framework) -LICENSE: GPL3 or later (tools, docs) - WWW: http://www.gnustep.org/ Index: x11-toolkits/gnustep-gui/Makefile =================================================================== --- x11-toolkits/gnustep-gui/Makefile (revision 383498) +++ x11-toolkits/gnustep-gui/Makefile (working copy) @@ -38,13 +38,8 @@ CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/lib -USES= pkgconfig -USE_GNUSTEP= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep pkgconfig +USE_GNUSTEP= base build USE_XORG= x11 xt EXTRA_PATCHES+= ${FILESDIR}/GNUmakefile.patch @@ -52,17 +47,16 @@ EXTRA_PATCHES+= ${FILESDIR}/AudioOutputSink.m.patch MAKE_FLAGS+= OPTFLAG="${CFLAGS}" MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -BREAKS_IF_PEDANTIC= yes PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} -ADDITIONAL_INCLUDE_DIRS+= -I${LOCALBASE}/include/libpng15 - CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell ASPELL_CONFIGURE_ENABLE= aspell +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} + post-patch: ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile Index: devel/performance/Makefile =================================================================== --- devel/performance/Makefile (revision 383498) +++ devel/performance/Makefile (working copy) @@ -4,8 +4,7 @@ PORTVERSION= 0.4.0 PORTREVISION= 1 CATEGORIES= devel gnustep -MASTER_SITES= ${MASTER_SITE_GNUSTEP} -MASTER_SITE_SUBDIR= libs +MASTER_SITES= GNUSTEP/libs DISTNAME= Performance-${PORTVERSION} MAINTAINER= theraven@FreeBSD.org @@ -13,10 +12,8 @@ LICENSE= LGPL3 -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= base build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} .include Index: databases/sqlclient/Makefile =================================================================== --- databases/sqlclient/Makefile (revision 383498) +++ databases/sqlclient/Makefile (working copy) @@ -13,18 +13,16 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Performance:${PERFORMANCE_PORT} -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -USES+= pgsql +LIB_DEPENDS= libPerformance.so:${PORTSDIR}/devel/performance \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 + +USES= gnustep pgsql +USE_GNUSTEP= base build +GNU_CONFIGURE= yes +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} USE_MYSQL=yes -USE_SQLITE=yes -LDFLAGS+= -lpthread +LDFLAGS+= -pthread MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT} DEFAULT_LIBVERSION= 1.5 DEFAULT_LIBVERSION2= 1.5.0 @@ -31,6 +29,4 @@ PLIST_SUB+= LIBVERSION2=${DEFAULT_LIBVERSION2} PLIST_SUB+= MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1} -PERFORMANCE_PORT?= devel/performance - .include Index: x11-toolkits/gnustep-back/Makefile =================================================================== --- x11-toolkits/gnustep-back/Makefile (revision 383498) +++ x11-toolkits/gnustep-back/Makefile (working copy) @@ -4,9 +4,7 @@ PORTVERSION= 0.24.0 PORTREVISION= 5 CATEGORIES= x11-toolkits gnustep -MASTER_SITES= ${MASTER_SITE_GNUSTEP} -MASTER_SITE_SUBDIR= core -PKGNAMESUFFIX?= ${BACK_SUFFIX}${PKGNAMESUFFIX2} +MASTER_SITES= GNUSTEP/core MAINTAINER= theraven@FreeBSD.org COMMENT= GNUstep GUI backend @@ -32,25 +30,20 @@ --enable-graphics=cairo \ --disable-glitz -USES= pkgconfig -USE_GNUSTEP= yes -USE_GNUSTEP_GUI= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_XORG= xft xrender xmu xext x11 xcursor xfixes xmu -USE_GL= yes +USES= gnustep pkgconfig +USE_GNUSTEP= base gui build +USE_XORG= xft xrender xmu xext x11 xcursor xfixes xmu +USE_GL= yes +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} -MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${LOCALBASE}/include" -MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} -BREAKS_IF_PEDANTIC= yes +MAKE_FLAGS+= OPTFLAG="${CFLAGS} -I${LOCALBASE}/include" +MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM +BACKVERSION= ${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} -CFLAGS+= -I${LOCALBASE}/include/freetype2 -PLIST_SUB+= BACK=back-${BACKVERSION} +CFLAGS+= -I${LOCALBASE}/include/freetype2 +PLIST_SUB+= BACK=back-${BACKVERSION} +PLIST_SUB+= BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} -PLIST_SUB+= BACKVERSION=${PORTVERSION:C/([0-9])*[.]([0-9]*).*/\1\2/1} - pre-configure: .for file in config.guess config.sub install-sh @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} Index: audio/mpdcon/Makefile =================================================================== --- audio/mpdcon/Makefile (revision 383498) +++ audio/mpdcon/Makefile (working copy) @@ -13,13 +13,11 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= SQLClient:databases/sqlclient +USES= gnustep +USE_GNUSTEP= base gui back build -LIB_DEPENDS+= libmpdclient.so.2:${PORTSDIR}/audio/libmpdclient +LIB_DEPENDS= libmpdclient.so.2:${PORTSDIR}/audio/libmpdclient \ + libSQLClient.so:${PORTSDIR}/databases/sqlclient post-patch: ${REINPLACE_CMD} -e \ Index: deskutils/preferencepanes/Makefile =================================================================== --- deskutils/preferencepanes/Makefile (revision 383498) +++ deskutils/preferencepanes/Makefile (working copy) @@ -12,12 +12,10 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build DEFAULT_LIBVERSION= 1.0.0 -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} WRKSRC= ${WRKDIR}/${DISTNAME}/PreferencePanes Index: mail/pantomime/Makefile =================================================================== --- mail/pantomime/Makefile (revision 383498) +++ mail/pantomime/Makefile (working copy) @@ -13,11 +13,9 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} DEFAULT_LIBVERSION= 1.2 Index: mail/addresses/Makefile =================================================================== --- mail/addresses/Makefile (revision 383498) +++ mail/addresses/Makefile (working copy) @@ -5,8 +5,7 @@ PORTVERSION= 0.4.8 PORTREVISION= 2 CATEGORIES= mail gnustep -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= gap +MASTER_SITES= SAVANNAH/gap DISTNAME= Addresses-${PORTVERSION} MAINTAINER= theraven@FreeBSD.org @@ -14,10 +13,8 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} .include Index: biology/biococoa/Makefile =================================================================== --- biology/biococoa/Makefile (revision 383498) +++ biology/biococoa/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/biococoa-${PORTVERSION} Index: graphics/gnustep-slideshowkit/Makefile =================================================================== --- graphics/gnustep-slideshowkit/Makefile (revision 383498) +++ graphics/gnustep-slideshowkit/Makefile (working copy) @@ -11,11 +11,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SlideShow Framework -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Libraries/libSlideShow.so Index: devel/wizardkit/Makefile =================================================================== --- devel/wizardkit/Makefile (revision 383498) +++ devel/wizardkit/Makefile (working copy) @@ -13,12 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Frameworks/WizardKit.framework/Versions/0/libWizardKit.so Index: devel/highlighterkit/Makefile =================================================================== --- devel/highlighterkit/Makefile (revision 383498) +++ devel/highlighterkit/Makefile (working copy) @@ -10,11 +10,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Framework needed by Project Manager -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} .include Index: x11/gskrab/Makefile =================================================================== --- x11/gskrab/Makefile (revision 383498) +++ x11/gskrab/Makefile (working copy) @@ -13,11 +13,9 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/GSKrabFramework/GSKrab.framework/Versions/Current Index: devel/fortytwo-encore/Makefile =================================================================== --- devel/fortytwo-encore/Makefile (revision 383498) +++ devel/fortytwo-encore/Makefile (working copy) @@ -15,12 +15,10 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build DEFAULT_LIBVERSION= 0.1 -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} WRKSRC= ${WRKDIR}/Encore DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/Encore Index: databases/fortytwo-bdb/Makefile =================================================================== --- databases/fortytwo-bdb/Makefile (revision 383498) +++ databases/fortytwo-bdb/Makefile (working copy) @@ -14,22 +14,19 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Encore:${ENCORE_PORT} +USES= gnustep +USE_GNUSTEP= back build + +LIB_DEPENDS= libEncore.so:${PORTSDIR}/devel/fortytwo-encore DEFAULT_LIBVERSION= 0.1 -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} USE_BDB= 43+ WRKSRC= ${WRKDIR}/BDB-${PORTVERSION} DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB -ADDITIONAL_OBJCFLAGS+= -I${BDB_INCLUDE_DIR} +ADDITIONAL_OBJCFLAGS+= -I${BDB_INCLUDE_DIR} -I${GNUSTEP_PREFIX}/ ADDITIONAL_LDFLAGS+= -L${BDB_LIB_DIR} -ENCORE_PORT?= devel/fortytwo-encore - OPTIONS_DEFINE= DOCS post-install: Index: graphics/fortytwo/Makefile =================================================================== --- graphics/fortytwo/Makefile (revision 383498) +++ graphics/fortytwo/Makefile (working copy) @@ -13,12 +13,11 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Encore:${ENCORE_PORT} -USE_GNUSTEP_LOCAL_LIBS+= BDB:${FORTYTWO_BDB_PORT} +USES= gnustep +USE_GNUSTEP= back build + +LIB_DEPENDS= libEncore.so:${PORTSDIR}/devel/fortytwo-encore \ + libBDB.so:${PORTSDIR}/databases/fortytwo-bdb DEFAULT_LIBVERSION= 0.1 USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} USE_BDB= 43+ @@ -26,8 +25,6 @@ WRKSRC= ${WRKDIR}/FT-${PORTVERSION} DOCSDIR= ${GNUSTEP_PREFIX}/Local/Library/Documentation/FT -ENCORE_PORT?= devel/fortytwo-encore -FORTYTWO_BDB_PORT?= databases/fortytwo-bdb ADDITIONAL_OBJCFLAGS+= -I${BDB_INCLUDE_DIR} ADDITIONAL_LDFLAGS+= -L${BDB_LIB_DIR} Index: graphics/camerakit/Makefile =================================================================== --- graphics/camerakit/Makefile (revision 383498) +++ graphics/camerakit/Makefile (working copy) @@ -12,12 +12,9 @@ LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= tar:bzip2 gnustep +USE_GNUSTEP= build back +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} WRKSRC= ${WRKDIR}/CameraKit Index: devel/gnustep/Makefile =================================================================== --- devel/gnustep/Makefile (revision 383498) +++ devel/gnustep/Makefile (working copy) @@ -5,23 +5,11 @@ PORTVERSION= 1.28.0 PORTREVISION= 2 CATEGORIES= devel lang gnustep -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty MAINTAINER= theraven@FreeBSD.org COMMENT= Objective-C libraries based on the OpenStep standard -# Backends are slave ports with conflicting plists -WITH_GNUSTEP_SINGLE_BACKEND=yes +USES= metaport gnustep +USE_GNUSTEP= back gui base -NO_BUILD= yes -NO_INSTALL= yes -NO_MTREE= yes - -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_GUI= yes -USE_GNUSTEP_BACK= yes - .include Index: deskutils/toolboxkit/Makefile =================================================================== --- deskutils/toolboxkit/Makefile (revision 383498) +++ deskutils/toolboxkit/Makefile (working copy) @@ -5,8 +5,7 @@ PORTREVISION= 3 CATEGORIES= deskutils gnustep MASTER_SITES= http://ftp.azc.uam.mx/mirrors/gnu/savannah/files/toolbox/Release.pkg/0.8/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= dinoex + LOCAL/dinoex PKGNAMESUFFIX= kit${PKGNAMESUFFIX2} DISTNAME= Toolbox-${PORTVERSION} @@ -15,13 +14,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Toolbox bundle for GNUstep -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} -WRKSRC= ${WRKDIR}/Toolbox -USE_GNUSTEP_MAKE_DIRS+= Toolbox +WRKSRC= ${WRKDIR}/Toolbox/Toolbox .include Index: audio/cddb-bundle/Makefile =================================================================== --- audio/cddb-bundle/Makefile (revision 383498) +++ audio/cddb-bundle/Makefile (working copy) @@ -14,11 +14,8 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build CDPLAYER_VERSION= 0.5.1 WRKSRC= ${WRKDIR}/CDPlayer-${CDPLAYER_VERSION}/Cddb Index: devel/gorm/Makefile =================================================================== --- devel/gorm/Makefile (revision 383498) +++ devel/gorm/Makefile (working copy) @@ -12,11 +12,9 @@ LICENSE= GPLv3 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} DEFAULT_LIBVERSION= 1.1.0 MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Index: games/gshisen/Makefile =================================================================== --- games/gshisen/Makefile (revision 383498) +++ games/gshisen/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Index: deskutils/gworkspace/Makefile =================================================================== --- deskutils/gworkspace/Makefile (revision 383498) +++ deskutils/gworkspace/Makefile (working copy) @@ -13,12 +13,9 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} GNU_CONFIGURE= yes ADDITIONAL_LDFLAGS+= -L${WRKSRC}/FSNode/FSNode.framework/Versions/A Index: x11/terminal.app/Makefile =================================================================== --- x11/terminal.app/Makefile (revision 383498) +++ x11/terminal.app/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Index: print/gspdf/Makefile =================================================================== --- print/gspdf/Makefile (revision 383498) +++ print/gspdf/Makefile (working copy) @@ -4,17 +4,14 @@ PORTVERSION= 0.5 PORTREVISION= 2 CATEGORIES= print gnustep -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= gap +MASTER_SITES= SAVANNAH/gap DISTNAME= GSPdf-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Postscript and Pdf Viewer for GNUstep -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build USE_GHOSTSCRIPT= yes MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Index: deskutils/systempreferences/Makefile =================================================================== --- deskutils/systempreferences/Makefile (revision 383498) +++ deskutils/systempreferences/Makefile (working copy) @@ -13,15 +13,10 @@ LICENSE= GPLv2 -PREFERENCEPANES_PORT?= deskutils/preferencepanes +USES= gnustep +USE_GNUSTEP= back build +LIB_DEPENDS= libPreferencePanes.so:${PORTSDIR}/deskutils/preferencepanes -USE_GNUSTEP= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_SYSTEM_LIBS+= PreferencePanes:${PREFERENCEPANES_PORT} - -USE_GNUSTEP_MAKE_DIRS= SystemPreferences Modules MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM .include Index: deskutils/gnustep-wrapper/Makefile =================================================================== --- deskutils/gnustep-wrapper/Makefile (revision 383498) +++ deskutils/gnustep-wrapper/Makefile (working copy) @@ -15,11 +15,9 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} ADDITIONAL_LIB_DIRS+= -L${WRKSRC}/libGSWrapper/obj MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Index: games/grubik/Makefile =================================================================== --- games/grubik/Makefile (revision 383498) +++ games/grubik/Makefile (working copy) @@ -12,11 +12,8 @@ LICENSE= GPLv2 # or later -USES= tar:tgz tar:tgz -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:tgz gnustep +USE_GNUSTEP= back build MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM Index: deskutils/gworkspace-gwmetadata/Makefile =================================================================== --- deskutils/gworkspace-gwmetadata/Makefile (revision 383498) +++ deskutils/gworkspace-gwmetadata/Makefile (working copy) @@ -14,14 +14,12 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_SYSTEM_LIBS+= DBKit:${GWORKSPACE_PORT} -USE_GNUSTEP_SYSTEM_LIBS+= PreferencePanes:${PREFERENCEPANES_PORT} -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +GNU_CONFIGURE= yes +LIB_DEPENDS= libDBKit.so:${PORTSDIR}/deskutils/gworkspace \ + libPreferencePanes.so:${PORTSDIR}/deskutils/preferencepanes +USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_SQLITE= yes LDFLAGS+= -lpthread @@ -33,9 +31,6 @@ DEFAULT_LIBVERSION= 0.1.0 MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM -GWORKSPACE_PORT?= deskutils/gworkspace -PREFERENCEPANES_PORT?= deskutils/preferencepanes - post-patch: ${CP} ${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile.in \ ${WRKSRC}/gmds/mdextractor/Extractors/JpegExtractor/GNUmakefile Index: mail/gnumail/Makefile =================================================================== --- mail/gnumail/Makefile (revision 383498) +++ mail/gnumail/Makefile (working copy) @@ -16,13 +16,11 @@ USES+= cpe CPE_VENDOR= gnu -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Pantomime:mail/pantomime -USE_GNUSTEP_LOCAL_LIBS+= Addresses:mail/addresses -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +LIB_DEPENDS= libPantomime.so:${PORTSDIR}/mail/pantomime \ + libAddresses.so:${PORTSDIR}/mail/addresses +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT} Index: textproc/easydiff/Makefile =================================================================== --- textproc/easydiff/Makefile (revision 383498) +++ textproc/easydiff/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 # or later; COPYING has GPLv3 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/EasyDiff.app/EasyDiff Index: graphics/imageviewer/Makefile =================================================================== --- graphics/imageviewer/Makefile (revision 383498) +++ graphics/imageviewer/Makefile (working copy) @@ -15,10 +15,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/ImageViewer.app/ImageViewer Index: graphics/gnustep-slideshow/Makefile =================================================================== --- graphics/gnustep-slideshow/Makefile (revision 383498) +++ graphics/gnustep-slideshow/Makefile (working copy) @@ -13,15 +13,10 @@ LICENSE= GPLv2 -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= SlideShow:${SLIDESHOWKIT_PORT} +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build +LIB_DEPENDS= libSlideShow.so:${PORTSDIR}/graphics/gnustep-slideshowkit OBJCFLAGS+= -Dsel_eq=sel_isEqual -SLIDESHOWKIT_PORT?= graphics/gnustep-slideshowkit - .include Index: graphics/preview/Makefile =================================================================== --- graphics/preview/Makefile (revision 383498) +++ graphics/preview/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Preview Index: sysutils/timemon/Makefile =================================================================== --- sysutils/timemon/Makefile (revision 383498) +++ sysutils/timemon/Makefile (working copy) @@ -14,10 +14,8 @@ NO_CDROM= distribute without fee -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${RM} ${WRKSRC}/shared_obj/*.* Index: graphics/cenon/Makefile =================================================================== --- graphics/cenon/Makefile (revision 383498) +++ graphics/cenon/Makefile (working copy) @@ -14,11 +14,8 @@ MAINTAINER= theraven@FreeBSD.org COMMENT= Vector graphics tool for GNUstep -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Cenon MAINVERSION= 4.0.2 Index: graphics/price/Makefile =================================================================== --- graphics/price/Makefile (revision 383498) +++ graphics/price/Makefile (working copy) @@ -14,14 +14,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= desktop-file-utils +USES= desktop-file-utils gnustep -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USE_GNUSTEP= back build -DATADIR= ${GNUSTEP_LOCAL_APPS}/PRICE.app +DATADIR= ${GNUSTEP_LOCAL_ROOT}/Applications/PRICE.app PORTDATA= * PLIST_FILES= ${GNUSTEP_LOCAL_TOOLS}/PRICE \ share/applications/PRICE.desktop @@ -28,7 +25,7 @@ post-build: ${SED} -i '' -e '/^Categories/s/=/&Graphics;/' \ - ${WRKSRC}/PRICE.app/Resources/PRICE.desktop + ${WRKSRC}/PRICE.app/Resources/PRICE.desktop post-install: ${STRIP_CMD} ${STAGEDIR}${DATADIR}/PRICE Index: math/edenmath/Makefile =================================================================== --- math/edenmath/Makefile (revision 383498) +++ math/edenmath/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: archivers/zipper/Makefile =================================================================== --- archivers/zipper/Makefile (revision 383498) +++ archivers/zipper/Makefile (working copy) @@ -12,10 +12,8 @@ MAINTAINER= bofh@FreeBSD.org COMMENT= Tool for inspecting the contents of a compressed archive -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: cd ${WRKSRC} && ${FIND} . -name "*#*" -exec ${RM} -f -v "{}" ";" Index: graphics/camera/Makefile =================================================================== --- graphics/camera/Makefile (revision 383498) +++ graphics/camera/Makefile (working copy) @@ -16,11 +16,8 @@ LIB_DEPENDS= libgphoto2_port.so:${PORTSDIR}/graphics/libgphoto2 -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Camera Index: games/gnustep-ladder/Makefile =================================================================== --- games/gnustep-ladder/Makefile (revision 383498) +++ games/gnustep-ladder/Makefile (working copy) @@ -17,10 +17,8 @@ RUN_DEPENDS= gnugo:${PORTSDIR}/games/gnugo -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Ladder.app/Ladder Index: science/gtamsanalyzer/Makefile =================================================================== --- science/gtamsanalyzer/Makefile (revision 383498) +++ science/gtamsanalyzer/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/${DISTNAME}/Source Index: science/paje/Makefile =================================================================== --- science/paje/Makefile (revision 383498) +++ science/paje/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/${DISTNAME} MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT} Index: x11-clocks/aclock/Makefile =================================================================== --- x11-clocks/aclock/Makefile (revision 383498) +++ x11-clocks/aclock/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/${DISTNAME} Index: games/lapispuzzle/Makefile =================================================================== --- games/lapispuzzle/Makefile (revision 383498) +++ games/lapispuzzle/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/LapisPuzzle-${PORTVERSION} Index: ftp/waiho/Makefile =================================================================== --- ftp/waiho/Makefile (revision 383498) +++ ftp/waiho/Makefile (working copy) @@ -13,11 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:tgz -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:tgz gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Waiho.app/Waiho Index: deskutils/affiche/Makefile =================================================================== --- deskutils/affiche/Makefile (revision 383498) +++ deskutils/affiche/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Affiche Index: games/gmastermind/Makefile =================================================================== --- games/gmastermind/Makefile (revision 383498) +++ games/gmastermind/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/GMastermind.app/GMastermind Index: games/jigsaw/Makefile =================================================================== --- games/jigsaw/Makefile (revision 383498) +++ games/jigsaw/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Jigsaw.app/Jigsaw Index: deskutils/gnustep-notebook/Makefile =================================================================== --- deskutils/gnustep-notebook/Makefile (revision 383498) +++ deskutils/gnustep-notebook/Makefile (working copy) @@ -14,10 +14,7 @@ LICENSE= GPLv2 -BROKEN= Unfetchable -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build .include Index: deskutils/helpviewer/Makefile =================================================================== --- deskutils/helpviewer/Makefile (revision 383498) +++ deskutils/helpviewer/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build FIXME= HandlerStructureXLP.h TextFormatterXLP.h Index: textproc/duncan/Makefile =================================================================== --- textproc/duncan/Makefile (revision 383498) +++ textproc/duncan/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Duncan Index: japanese/jishyo/Makefile =================================================================== --- japanese/jishyo/Makefile (revision 383498) +++ japanese/jishyo/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/${DISTNAME} Index: games/gmines/Makefile =================================================================== --- games/gmines/Makefile (revision 383498) +++ games/gmines/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/GMines.app/GMines Index: x11/innerspace/Makefile =================================================================== --- x11/innerspace/Makefile (revision 383498) +++ x11/innerspace/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: ftp/gnustep-ftp/Makefile =================================================================== --- ftp/gnustep-ftp/Makefile (revision 383498) +++ ftp/gnustep-ftp/Makefile (working copy) @@ -14,10 +14,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: sysutils/batmon/Makefile =================================================================== --- sysutils/batmon/Makefile (revision 383498) +++ sysutils/batmon/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: net/remotedesk/Makefile =================================================================== --- net/remotedesk/Makefile (revision 383498) +++ net/remotedesk/Makefile (working copy) @@ -14,10 +14,8 @@ RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: deskutils/displaycalibrator/Makefile =================================================================== --- deskutils/displaycalibrator/Makefile (revision 383498) +++ deskutils/displaycalibrator/Makefile (working copy) @@ -9,10 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Frontend to xgamma -BROKEN= Unfetchable -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build .include Index: multimedia/poe/Makefile =================================================================== --- multimedia/poe/Makefile (revision 383498) +++ multimedia/poe/Makefile (working copy) @@ -14,10 +14,8 @@ LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build PORTSCOUT= skipv:0.5.2 Index: deskutils/plopfolio/Makefile =================================================================== --- deskutils/plopfolio/Makefile (revision 383498) +++ deskutils/plopfolio/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build FIXME= Channel.m PlopFolio.m PreferencesPanelController.m Index: audio/gnustep-cdplayer/Makefile =================================================================== --- audio/gnustep-cdplayer/Makefile (revision 383498) +++ audio/gnustep-cdplayer/Makefile (working copy) @@ -13,22 +13,18 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libcdaudio.so:${PORTSDIR}/audio/libcdaudio +LIB_DEPENDS= libcdaudio.so:${PORTSDIR}/audio/libcdaudio \ + libPrefsModule.so:${PORTSDIR}/deskutils/preferences -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:${CDDB_BUNDLE_PORT} -USE_GNUSTEP_SYSTEM_LIBS+= PrefsModule:${PREFERENCES_PORT} +BUILD_DEPENDS= cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle +RUN_DEPENDS= cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build + WRKSRC= ${WRKDIR}/CDPlayer-${PORTVERSION} MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT} -CDDB_BUNDLE_PORT?= audio/cddb-bundle -PREFERENCES_PORT?= deskutils/preferences - post-install: ${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Bundles/AudioCD.bundle/AudioCD \ Index: lang/gscheme/Makefile =================================================================== --- lang/gscheme/Makefile (revision 383498) +++ lang/gscheme/Makefile (working copy) @@ -15,10 +15,8 @@ LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-extract: @${CHMOD} -R u+w ${WRKSRC} Index: games/nextgo/Makefile =================================================================== --- games/nextgo/Makefile (revision 383498) +++ games/nextgo/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: finance/expense/Makefile =================================================================== --- finance/expense/Makefile (revision 383498) +++ finance/expense/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Expense Index: archivers/freetar/Makefile =================================================================== --- archivers/freetar/Makefile (revision 383498) +++ archivers/freetar/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/FreeTar_1_1_1_Source Index: textproc/localize/Makefile =================================================================== --- textproc/localize/Makefile (revision 383498) +++ textproc/localize/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/Localize Index: deskutils/appwrapper/Makefile =================================================================== --- deskutils/appwrapper/Makefile (revision 383498) +++ deskutils/appwrapper/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/AppWrapper Index: graphics/pixen/Makefile =================================================================== --- graphics/pixen/Makefile (revision 383498) +++ graphics/pixen/Makefile (working copy) @@ -13,11 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt -USES= tar:bzip2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:bzip2 gnustep +USE_GNUSTEP= back build ADDITIONAL_OBJCFLAGS+= -Dlog2=logb Index: deskutils/cartotheque/Makefile =================================================================== --- deskutils/cartotheque/Makefile (revision 383498) +++ deskutils/cartotheque/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-patch: ${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DIR|#GNUSTEP_INSTALLATION_DIR|' \ Index: news/lusernet/Makefile =================================================================== --- news/lusernet/Makefile (revision 383498) +++ news/lusernet/Makefile (working copy) @@ -13,12 +13,8 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_LOCAL_LIBS+= Pantomime:${PANTOMIME_PORT} +USES= gnustep +USE_GNUSTEP= back build +LIB_DEPENDS= libPantomime.so:${PORTSDIR}/mail/pantomime -PANTOMIME_PORT?= mail/pantomime - .include Index: textproc/popup/Makefile =================================================================== --- textproc/popup/Makefile (revision 383498) +++ textproc/popup/Makefile (working copy) @@ -12,9 +12,7 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build .include Index: games/fortunate/Makefile =================================================================== --- games/fortunate/Makefile (revision 383498) +++ games/fortunate/Makefile (working copy) @@ -9,11 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Graphical front-end to the command-line BSD fortune -BROKEN= No public distfiles +USES= gnustep +USE_GNUSTEP= back build -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes - .include Index: games/gnustep-sudoku/Makefile =================================================================== --- games/gnustep-sudoku/Makefile (revision 383498) +++ games/gnustep-sudoku/Makefile (working copy) @@ -13,10 +13,8 @@ LICENSE= GPLv3 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/Sudoku.app/Sudoku Index: graphics/laternamagica/Makefile =================================================================== --- graphics/laternamagica/Makefile (revision 383498) +++ graphics/laternamagica/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= GPLv2 # or later -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Applications/LaternaMagica.app/LaternaMagica Index: deskutils/simpleagenda/Makefile =================================================================== --- deskutils/simpleagenda/Makefile (revision 383498) +++ deskutils/simpleagenda/Makefile (working copy) @@ -14,11 +14,9 @@ LICENSE= GPLv2 -USE_GNUSTEP= yes -USE_GNUSTEP_CONFIGURE= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include Index: net/zillion/Makefile =================================================================== --- net/zillion/Makefile (revision 383498) +++ net/zillion/Makefile (working copy) @@ -12,10 +12,8 @@ LICENSE= BSD -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= gnustep +USE_GNUSTEP= back build WRKSRC= ${WRKDIR}/${PORTNAME} Index: mail/addresses-goodies/Makefile =================================================================== --- mail/addresses-goodies/Makefile (revision 383498) +++ mail/addresses-goodies/Makefile (working copy) @@ -4,8 +4,7 @@ PORTVERSION= 0.4.8 PORTREVISION= 3 CATEGORIES= mail gnustep -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= gap +MASTER_SITES= SAVANNAH/gap PKGNAMESUFFIX= -goodies${PKGNAMESUFFIX2} DISTNAME= Addresses-${PORTVERSION} @@ -14,20 +13,16 @@ LICENSE= LGPL21 -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes -USE_GNUSTEP_SYSTEM_LIBS+= Inspector:${GWORKSPACE_PORT} -USE_GNUSTEP_LOCAL_LIBS+= Addresses:${ADDRESSES_PORT} -USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} +USES= gnustep +USE_GNUSTEP= back build +LIB_DEPENDS= libInspector.so:${PORTSDIR}/deskutils/gworkspace \ + libAddresses.so:${PORTSDIR}/mail/addresses +USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} + UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/Addresses-${PORTVERSION}/Goodies -ADDRESSES_PORT?= mail/addresses -GWORKSPACE_PORT?= deskutils/gworkspace - post-patch: ${REINPLACE_CMD} -e 's|LDAPAddressBook||' \ -e 's|VCFViewer||' \ Index: textproc/latex-service/Makefile =================================================================== --- textproc/latex-service/Makefile (revision 383498) +++ textproc/latex-service/Makefile (working copy) @@ -13,11 +13,8 @@ LICENSE= GPLv2 -USES= tar:tgz -USE_GNUSTEP= yes -USE_GNUSTEP_BACK= yes -USE_GNUSTEP_BUILD= yes -USE_GNUSTEP_INSTALL= yes +USES= tar:tgz gnustep +USE_GNUSTEP= back build post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/Local/Library/Services/LaTeX.service/LaTeX Index: x11/gnustep-app/Makefile =================================================================== --- x11/gnustep-app/Makefile (revision 383498) +++ x11/gnustep-app/Makefile (working copy) @@ -5,108 +5,86 @@ PORTVERSION= 2.0.0 PORTREVISION= 4 CATEGORIES= x11 gnustep -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty MAINTAINER= theraven@FreeBSD.org COMMENT= Metaport for GNUstep applications -NO_BUILD= yes -NO_INSTALL= yes -NO_MTREE= yes -USE_GNUSTEP= yes -USE_GNUSTEP_BASE= yes -USE_GNUSTEP_GUI= yes -USE_GNUSTEP_BACK= yes +USES= metaport gnustep +USE_GNUSTEP= back base gui -USE_GNUSTEP_SYSTEM_LIBS+= \ - PreferencePanes:deskutils/preferencepanes \ +RUN_DEPENDS= aclock>0:${PORTSDIR}/x11-clocks/aclock \ + addresses>0:${PORTSDIR}/mail/addresses \ + adtool>0:${PORTSDIR}/mail/addresses-goodies \ + affiche>0:${PORTSDIR}/deskutils/affiche \ + appwrapper>0:${PORTSDIR}/deskutils/appwrapper \ + batmon>0:${PORTSDIR}/sysutils/batmon \ + biococoa>0:${PORTSDIR}/biology/biococoa \ + camera>0:${PORTSDIR}/graphics/camera \ + camerakit>0:${PORTSDIR}/graphics/camerakit \ + cartotheque>0:${PORTSDIR}/deskutils/cartotheque \ + cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle \ + cdplayer>0:${PORTSDIR}/audio/gnustep-cdplayer \ + cenon>0:${PORTSDIR}/graphics/cenon \ + displaycalibrator>0:${PORTSDIR}/deskutils/displaycalibrator \ + duncan>0:${PORTSDIR}/textproc/duncan \ + easydiff>0:${PORTSDIR}/textproc/easydiff \ + edenmath>0:${PORTSDIR}/math/edenmath \ + expense>0:${PORTSDIR}/finance/expense \ + fortunate>0:${PORTSDIR}/games/fortunate \ + fortytwo-bdb>0:${PORTSDIR}/databases/fortytwo-bdb \ + fortytwo-encore>0:${PORTSDIR}/devel/fortytwo-encore \ + fortytwo>0:${PORTSDIR}/graphics/fortytwo \ + freetar>0:${PORTSDIR}/archivers/freetar \ + gmastermind>0:${PORTSDIR}/games/gmastermind \ + gmines>0:${PORTSDIR}/games/gmines \ + gnumail>0:${PORTSDIR}/mail/gnumail \ + gnustep-ftp>0:${PORTSDIR}/ftp/gnustep-ftp \ + gnustep-ladder>0:${PORTSDIR}/games/gnustep-ladder \ + gnustep-slideshowkit>0:${PORTSDIR}/graphics/gnustep-slideshowkit \ + gnustep-slideshow>0:${PORTSDIR}/graphics/gnustep-slideshow \ + gnustep-sudoku>0:${PORTSDIR}/games/gnustep-sudoku \ + gnustep-wrapper>0:${PORTSDIR}/deskutils/gnustep-wrapper \ + gorm>0:${PORTSDIR}/devel/gorm \ + grubik>0:${PORTSDIR}/games/grubik \ + gscheme>0:${PORTSDIR}/lang/gscheme \ + gshisen>0:${PORTSDIR}/games/gshisen \ + gskrab>0:${PORTSDIR}/x11/gskrab \ + gspdf>0:${PORTSDIR}/print/gspdf \ + gtamsanalyzer>0:${PORTSDIR}/science/gtamsanalyzer \ + gworkspace-gwmetadata>0:${PORTSDIR}/deskutils/gworkspace-gwmetadata \ + gworkspace>0:${PORTSDIR}/deskutils/gworkspace \ + helpviewer>0:${PORTSDIR}/deskutils/helpviewer \ + highlighterkit>0:${PORTSDIR}/devel/highlighterkit \ + imageviewer>0:${PORTSDIR}/graphics/imageviewer \ + innerspace>0:${PORTSDIR}/x11/innerspace \ + jigsaw>0:${PORTSDIR}/games/jigsaw \ + jishyo>0:${PORTSDIR}/japanese/jishyo \ + lapispuzzle>0:${PORTSDIR}/games/lapispuzzle \ + laternamagica>0:${PORTSDIR}/graphics/laternamagica \ + latex-service>0:${PORTSDIR}/textproc/latex-service \ + localize>0:${PORTSDIR}/textproc/localize \ + lusernet>0:${PORTSDIR}/news/lusernet \ + mpdcon>0:${PORTSDIR}/audio/mpdcon \ + nextgo>0:${PORTSDIR}/games/nextgo \ + notebook>0:${PORTSDIR}/deskutils/gnustep-notebook \ + paje>0:${PORTSDIR}/science/paje \ + pantomime>0:${PORTSDIR}/mail/pantomime \ + pixen>0:${PORTSDIR}/graphics/pixen \ + plopfolio>0:${PORTSDIR}/deskutils/plopfolio \ + poe>0:${PORTSDIR}/multimedia/poe \ + popup>0:${PORTSDIR}/textproc/popup \ + preferencepanes>0:${PORTSDIR}/deskutils/preferencepanes \ + preview>0:${PORTSDIR}/graphics/preview \ + price>0:${PORTSDIR}/graphics/price \ + remotedesk>0:${PORTSDIR}/net/remotedesk \ + simpleagenda>0:${PORTSDIR}/deskutils/simpleagenda \ + systempreferences>0:${PORTSDIR}/deskutils/systempreferences \ + terminal.app>0:${PORTSDIR}/x11/terminal.app \ + timemon>0:${PORTSDIR}/sysutils/timemon \ + toolboxkit>0:${PORTSDIR}/deskutils/toolboxkit \ + waiho>0:${PORTSDIR}/ftp/waiho \ + wizardkit>0:${PORTSDIR}/devel/wizardkit \ + zillion>0:${PORTSDIR}/net/zillion \ + zipper>0:${PORTSDIR}/archivers/zipper -USE_GNUSTEP_LOCAL_LIBS+= \ - Pantomime:mail/pantomime \ - Addresses:mail/addresses \ - BioCocoa:biology/biococoa \ - SlideShow:graphics/gnustep-slideshowkit \ - WizardKit:devel/wizardkit \ - HighlighterKit:devel/highlighterkit \ - GSKrab:x11/gskrab \ - Encore:devel/fortytwo-encore \ - BDB:databases/fortytwo-bdb \ - FT:graphics/fortytwo \ - CameraKit:graphics/camerakit \ - Toolbox:deskutils/toolboxkit \ - -USE_GNUSTEP_LOCAL_BUNDLES+= \ - Cddb:audio/cddb-bundle \ - -USE_GNUSTEP_SYSTEM_APPS+= \ - Gorm:devel/gorm \ - GShisen:games/gshisen \ - GWorkspace:deskutils/gworkspace \ - Terminal:x11/terminal.app \ - GSPdf:print/gspdf \ - SystemPreferences:deskutils/systempreferences \ - WrapperFactory:deskutils/gnustep-wrapper \ - GRubik:games/grubik \ - MDFinder:deskutils/gworkspace-gwmetadata \ - -USE_GNUSTEP_LOCAL_APPS+= \ - GNUMail:mail/gnumail \ - EasyDiff:textproc/easydiff \ - ImageViewer:graphics/imageviewer \ - SlideShow:graphics/gnustep-slideshow \ - Preview:graphics/preview \ - TimeMon:sysutils/timemon \ - Cenon:graphics/cenon \ - PRICE:graphics/price \ - EdenMath:math/edenmath \ - Zipper:archivers/zipper \ - Camera:graphics/camera \ - Ladder:games/gnustep-ladder \ - GTAMSAnalyzer:science/gtamsanalyzer \ - Paje:science/paje \ - AClock:x11-clocks/aclock \ - LapisPuzzle:games/lapispuzzle \ - Waiho:ftp/waiho \ - Affiche:deskutils/affiche \ - GMastermind:games/gmastermind \ - Jigsaw:games/jigsaw \ - NoteBook:deskutils/gnustep-notebook \ - HelpViewer:deskutils/helpviewer \ - Duncan:textproc/duncan \ - Jishyo:japanese/jishyo \ - GMines:games/gmines \ - InnerSpace:x11/innerspace \ - FTP:ftp/gnustep-ftp \ - batmon:sysutils/batmon \ - RemoteDesk:net/remotedesk \ - DisplayCalibrator:deskutils/displaycalibrator \ - Poe:multimedia/poe \ - MPDCon:audio/mpdcon \ - PlopFolio:deskutils/plopfolio \ - CDPlayer:audio/gnustep-cdplayer \ - GScheme:lang/gscheme \ - NeXTGo:games/nextgo \ - Expense:finance/expense \ - FreeTar:archivers/freetar \ - Localize:textproc/localize \ - AppWrapper:deskutils/appwrapper \ - Pixen:graphics/pixen \ - Cartotheque:deskutils/cartotheque \ - LuserNET:news/lusernet \ - Popup:textproc/popup \ - Fortunate:games/fortunate \ - Sudoku:games/gnustep-sudoku \ - LaternaMagica:graphics/laternamagica \ - SimpleAgenda:deskutils/simpleagenda \ - -USE_GNUSTEP_LOCAL_TOOLS+= \ - zillion:net/zillion \ - adtool:mail/addresses-goodies \ - - -USE_GNUSTEP_LOCAL_SERVICES+= \ - LaTeX:textproc/latex-service \ - .include Index: Mk/bsd.gnustep.mk =================================================================== --- Mk/bsd.gnustep.mk (revision 383498) +++ Mk/bsd.gnustep.mk (working copy) @@ -1,448 +0,0 @@ -# -# $FreeBSD$ -# -# This file contains some variable definitions that are supposed to -# make your life easier when dealing with ports related to the GNUstep. -# -# -# Options for a port before include this file: -# ============================================ -# -# USE_GNUSTEP_BASE=yes -# your port depends on the gnustep-base port. -# -# USE_GNUSTEP_GUI=yes -# your port depends on the gnustep-gui port. -# -# USE_GNUSTEP_BACK=yes -# your port depends on the gnustep-back port. -# -# USE_GNUSTEP_CONFIGURE=yes -# call configure script with GNUstep.sh sourced in the current shell -# -# USE_GNUSTEP_BUILD=yes -# call build target with GNUstep.sh sourced in the current shell -# -# USE_GNUSTEP_INSTALL=yes -# call install target with GNUstep.sh sourced in the current shell -# -# USE_GNUSTEP_MAKE_DIRS= App Tools -# call build and install target in each of the given dirs. -# -# USE_GNUSTEP_MAKE=yes -# require GNUstep.sh for build and install -# -# USE_GNUSTEP_SYSTEM_LIBS+= Renaissance:x11-toolkits/renaissance -# depends on a shared lib in System directory -# -# USE_GNUSTEP_SYSTEM_BUNDLES+= EtoileMenus:x11-themes/etoile-etoilemenus -# depends on Bundles installed in System directory -# -# USE_GNUSTEP_SYSTEM_THEMES+= Camaelon:x11-themes/etoile-camaelon -# depends on Themes installed in System directory -# -# USE_GNUSTEP_LOCAL_LIBS+= pantomime:mail/pantomime -# depends on a shared lib in Local directory -# -# USE_GNUSTEP_LOCAL_BUNDLES+= Cddb:audio/cddb-bundle -# depends on Bundles installed in Local directory -# -# USE_GNUSTEP_LOCAL_THEMES+= WildMenus:x11-themes/etoile-wildmenus -# depends on Themes installed in Local directory -# -# USE_GNUSTEP_LOCAL_MENULETS+= PowerMenulet:sysutils/etoile-powermenulet -# depends on Menulets installed in Local directory -# -# USE_GNUSTEP_LOCAL_ASTS+= CommentToLog:lang/etoile-lkplugins -# depends on Ast Bundles installed in Local directory -# -# USE_GNUSTEP_LOCAL_BURNS+= MP3ToWav:audio/mp3towav-bundle -# depends on Burn Bundles installed in Local directory -# -# USE_GNUSTEP_SYSTEM_APPS+= ProjectCenter:devel/projectcenter.app -# depends on Application installed in System directory -# -# USE_GNUSTEP_LOCAL_APPS+= Ink:misc/gnustep-examples -# depends on Application installed in Local directory -# -# USE_GNUSTEP_SYSTEM_TOOLS+= resizer:deskutils/gworkspace -# depends on Tool installed in System directory -# -# USE_GNUSTEP_LOCAL_TOOLS+= zillion:net/zillion -# depends on Tool installed in Local directory -# -# USE_GNUSTEP_SYSTEM_SERVICES+= thumbnailer:deskutils/gworkspace -# depends on Services installed in System directory -# -# USE_GNUSTEP_LOCAL_SERVICES+= LaTeX:textproc/latex-service -# depends on Services installed in Local directory -# -# --------------------------------------------------------------------------- -.if !defined(_POSTMKINCLUDED) - -GNUstep_Include_MAINTAINER= ports@FreeBSD.org - -.if defined(USE_GNUSTEP_BUILD) || defined(USE_GNUSTEP_MAKE) -BUILD_DEPENDS+= ${GNUSTEP_MAKEFILES}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} -.endif -.if defined(USE_GNUSTEP_INSTALL) || defined(USE_GNUSTEP_MAKE) -RUN_DEPENDS+= ${GNUSTEP_MAKEFILES}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} -.endif - -GNUSTEP_MAKE_PORT?= devel/gnustep-make -GNUSTEP_BASE_PORT?= lang/gnustep-base -GNUSTEP_GUI_PORT?= x11-toolkits/gnustep-gui -GNUSTEP_BACK_PORT?= x11-toolkits/gnustep-back -# Note: back-cairo will be deprecated in favour of Opal soon... - -.if ${MACHINE_ARCH} == "i386" -GNU_ARCH= ix86 -.else -GNU_ARCH= ${MACHINE_ARCH} -.endif - -.if !defined(USE_MAKEFILE) -USES+= gmake -MAKEFILE= GNUmakefile -.endif - -.if defined(ADDITIONAL_FLAGS) -MAKE_ENV+= ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS}" -.endif -.if defined(ADDITIONAL_CFLAGS) -MAKE_ENV+= ADDITIONAL_CFLAGS="${ADDITIONAL_CFLAGS}" -.endif -.if defined(ADDITIONAL_CPPFLAGS) -MAKE_ENV+= ADDITIONAL_CPPFLAGS="${ADDITIONAL_CPPFLAGS}" -.endif -.if defined(ADDITIONAL_OBJCFLAGS) -MAKE_ENV+= ADDITIONAL_OBJCFLAGS="${ADDITIONAL_OBJCFLAGS}" -.endif -.if defined(ADDITIONAL_INCLUDE_DIRS) -MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}" -.endif -.if defined(ADDITIONAL_LDFLAGS) -MAKE_ENV+= ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}" -.endif -.if defined(ADDITIONAL_LIB_DIRS) -MAKE_ENV+= ADDITIONAL_LIB_DIRS="${ADDITIONAL_LIB_DIRS}" -.endif - -GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep -DEFAULT_LIBVERSION?= 0.0.1 - -.if defined(USE_GNUSTEP_PREFIX) -PREFIX= ${GNUSTEP_PREFIX} -NO_MTREE= yes -.endif - -GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_PREFIX}/System -GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles -GNUSTEP_SYSTEM_BUNDLES= ${GNUSTEP_SYSTEM_ROOT}/Library/Bundles -GNUSTEP_SYSTEM_LIBRARIES= ${GNUSTEP_SYSTEM_ROOT}/Library/Libraries -GNUSTEP_SYSTEM_APPS= ${GNUSTEP_SYSTEM_ROOT}/Applications -GNUSTEP_SYSTEM_TOOLS= ${GNUSTEP_SYSTEM_ROOT}/Tools -GNUSTEP_SYSTEM_SERVICES= ${GNUSTEP_SYSTEM_ROOT}/Library/Services - -GNUSTEP_LOCAL_ROOT= ${GNUSTEP_PREFIX}/Local -GNUSTEP_LOCAL_BUNDLES= ${GNUSTEP_LOCAL_ROOT}/Library/Bundles -GNUSTEP_LOCAL_LIBRARIES= ${GNUSTEP_LOCAL_ROOT}/Library/Libraries -GNUSTEP_LOCAL_APPS= ${GNUSTEP_LOCAL_ROOT}/Applications -GNUSTEP_LOCAL_TOOLS= ${GNUSTEP_LOCAL_ROOT}/Tools -GNUSTEP_LOCAL_SERVICES= ${GNUSTEP_LOCAL_ROOT}/Library/Services - -.if defined(WITH_GNUSTEP_DEVEL) -PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} -PLIST_SUB+= GNUSTEP_DEVEL="" -PLIST_SUB+= GNUSTEP_STABLE="@comment " -.else -PLIST_SUB+= GNUSTEP_DEVEL="@comment " -PLIST_SUB+= GNUSTEP_STABLE="" -.endif - -PLIST_SUB+= GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION} -PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} -PLIST_SUB+= LIBVERSION=${DEFAULT_LIBVERSION} -PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1} - -.if exists(${DESTDIR}/usr/bin/clang) -_CLANG!= ${DESTDIR}/usr/bin/clang --version | head -1 | \ - ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' -.else -_CLANG= 0 -.endif - -.if ${_CLANG} < 34 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 -CPP= ${LOCALBASE}/bin/clang-cpp34 -CC= ${LOCALBASE}/bin/clang34 -CXX= ${LOCALBASE}/bin/clang++34 -.else -CPP= /usr/bin/clang-cpp -CC= /usr/bin/clang -CXX= /usr/bin/clang++ -.endif - -MAKE_ENV+= "CC=${CC} CXX=${CXX}" - - - -# --------------------------------------------------------------------------- -# using base -# -.if defined(USE_GNUSTEP_BASE) -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} -LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2 -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} -.endif - -# --------------------------------------------------------------------------- -# using gui -# -.if defined(USE_GNUSTEP_GUI) -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT} -.endif - -# --------------------------------------------------------------------------- -# using any backend -# -.if defined(USE_GNUSTEP_BACK) -BACKSUFFIX?= -024 -BACKCAIRO= libgnustep-back${BACKSUFFIX} - -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_BACK_PORT} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${BACKCAIRO}.bundle/${BACKCAIRO}:${PORTSDIR}/${GNUSTEP_BACK_PORT} - -MAKE_FLAGS+= GUI_BACKEND_LIB=cairo -.endif - -# --------------------------------------------------------------------------- -# source system libs -# -.if defined(USE_GNUSTEP_SYSTEM_LIBS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_LIBS} -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source system bundles -# -.if defined(USE_GNUSTEP_SYSTEM_BUNDLES) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_BUNDLES} -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source system themes -# -.if defined(USE_GNUSTEP_SYSTEM_THEMES) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_THEMES} -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local libs -# -.if defined(USE_GNUSTEP_LOCAL_LIBS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_LIBS} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_LIBRARIES}/lib${_GNUSTEP_DEP:C/:.*//}.so:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local bundles -# -.if defined(USE_GNUSTEP_LOCAL_BUNDLES) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BUNDLES} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//:C;.*/;;}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//:C;.*/;;}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local themes -# -.if defined(USE_GNUSTEP_LOCAL_THEMES) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_THEMES} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.themeEngine/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local menulets -# -.if defined(USE_GNUSTEP_LOCAL_MENULETS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_MENULETS} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.menulet/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/${_GNUSTEP_DEP:C/:.*//}.menulet/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local asts -# -.if defined(USE_GNUSTEP_LOCAL_ASTS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_ASTS} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/LanguageKit/${_GNUSTEP_DEP:C/:.*//}.ast/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_BUNDLES}/LanguageKit/${_GNUSTEP_DEP:C/:.*//}.ast/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local burns -# -.if defined(USE_GNUSTEP_LOCAL_BURNS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_BURNS} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_ROOT}/Library/Burn/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_ROOT}/Library/Burn/${_GNUSTEP_DEP:C/:.*//}.bundle/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source system apps -# -.if defined(USE_GNUSTEP_SYSTEM_APPS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_APPS} -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local apps -# -.if defined(USE_GNUSTEP_LOCAL_APPS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_APPS} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_APPS}/${_GNUSTEP_DEP:C/:.*//}.app/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source system tools -# -.if defined(USE_GNUSTEP_SYSTEM_TOOLS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_TOOLS} -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local tools -# -.if defined(USE_GNUSTEP_LOCAL_TOOLS) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_TOOLS} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_TOOLS}/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source system services -# -.if defined(USE_GNUSTEP_SYSTEM_SERVICES) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_SYSTEM_SERVICES} -BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_SYSTEM_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source local services -# -.if defined(USE_GNUSTEP_LOCAL_SERVICES) -.for _GNUSTEP_DEP in ${USE_GNUSTEP_LOCAL_SERVICES} -BUILD_DEPENDS+= ${GNUSTEP_LOCAL_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -RUN_DEPENDS+= ${GNUSTEP_LOCAL_SERVICES}/${_GNUSTEP_DEP:C/:.*//}.service/${_GNUSTEP_DEP:C/:.*//}:${PORTSDIR}/${_GNUSTEP_DEP:C/.*://} -.endfor -.endif - -# --------------------------------------------------------------------------- -# source GNUstep.sh -# -.if defined(USE_GNUSTEP_CONFIGURE) -NO_CCACHE= Overrides PATH set from GNUstep.sh -run-autotools:: - @${DO_NADA} - -do-configure: - @(cd ${CONFIGURE_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ - if ! ${SETENV} CC="${CC}" CXX="${CXX}" CPP="${CPP}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - 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) -.endif - -# --------------------------------------------------------------------------- -# source GNUstep.sh -# -.if defined(USE_GNUSTEP_BUILD) -NO_CCACHE= Overrides PATH set from GNUstep.sh -do-build: -.if defined(USE_GNUSTEP_MAKE_DIRS) -.for i in ${USE_GNUSTEP_MAKE_DIRS} - @(cd ${BUILD_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) -.endfor -.else - @(cd ${BUILD_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) -.endif - -.endif - -# --------------------------------------------------------------------------- -# source GNUstep.sh -# -.if defined(USE_GNUSTEP_INSTALL) -do-install: -.if defined(USE_GNUSTEP_MAKE_DIRS) -.for i in ${USE_GNUSTEP_MAKE_DIRS} - @(cd ${INSTALL_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endfor -.else - @(cd ${INSTALL_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.endif -.if defined(PACKAGE_BUILDING) || defined(BATCH) || defined(CLEAN_ROOT) - rm -rf /root/GNUstep -.endif - -.endif - -.if !defined(GNUSTEP_WITH_BASE_GCC) -TARGLIB!= ${MAKE} -C ${PORTSDIR}/${GNUSTEP_GCC_PORT} -V TARGLIB -.endif - -.endif - -# --------------------------------------------------------------------------- -# run ldconfig for installed shlibs -# -.if defined(USE_GNUSTEP_LDCONFIG) -.for i in ${USE_GNUSTEP_LDCONFIG} -USE_LDCONFIG+= ${i} -.endfor -.endif - -# eof Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 383508) +++ Mk/bsd.port.mk (working copy) @@ -389,10 +389,6 @@ # USE_RUBY - If set, this port relies on the Ruby language. # Implies inclusion of bsd.ruby.mk. (Also see # that file for more information on USE_RUBY_*). -# USE_GNUSTEP - If set, this port relies on the GNUstep system. -# Implies the inclusion of bsd.gnustep.mk. -# (Also see that file for more information on -# USE_GNUSTEP_*). ## # USE_GECKO - If set, this port uses the Gecko/Mozilla product. # See bsd.gecko.mk for more details. @@ -1373,10 +1369,6 @@ .include "${PORTSDIR}/Mk/bsd.emacs.mk" .endif -.if defined(USE_GNUSTEP) -.include "${PORTSDIR}/Mk/bsd.gnustep.mk" -.endif - .if defined(USE_PHP) .include "${PORTSDIR}/Mk/bsd.php.mk" .endif Index: Mk/Uses/gnustep.mk =================================================================== --- Mk/Uses/gnustep.mk (revision 0) +++ Mk/Uses/gnustep.mk (working copy) @@ -0,0 +1,68 @@ +# $FreeBSD$ +# +# +# + +.if !defined(_INCLUDE_USES_GNUSTEP_MK) +_INCLUDE_USES_GNUSTEP_MK= yes +.include "${USESDIR}/gmake.mk" + +GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep +DEFAULT_LIBVERSION?= 0.0.1 + +GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_PREFIX}/System +GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles +GNUSTEP_SYSTEM_LIBRARIES= ${GNUSTEP_SYSTEM_ROOT}/Library/Libraries +GNUSTEP_SYSTEM_TOOLS= ${GNUSTEP_SYSTEM_ROOT}/Tools + +GNUSTEP_LOCAL_ROOT= ${GNUSTEP_PREFIX}/Local +GNUSTEP_LOCAL_LIBRARIES= ${GNUSTEP_LOCAL_ROOT}/Library/Libraries +GNUSTEP_LOCAL_TOOLS= ${GNUSTEP_LOCAL_ROOT}/Tools + +LIB_DIRS+= ${GNUSTEP_SYSTEM_LIBRARIES} \ + ${GNUSTEP_LOCAL_LIBRARIES} + +.for a in FLAGS CFLAGS CPPFLAGS OBJCFLAGS INCLUDE_DIRS LDFLAGS LIB_DIRS +MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}}" +.endfor + +MAKEFILE= GNUmakefile +MAKE_ENV+= GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf +GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX} + +.if ${MACHINE_ARCH} == "i386" +GNU_ARCH= ix86 +.else +GNU_ARCH= ${MACHINE_ARCH} +.endif + +PLIST_SUB+= GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION} +PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} +PLIST_SUB+= LIBVERSION=${DEFAULT_LIBVERSION} +PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1} + +.if defined(USE_GNUSTEP) +. if ${USE_GNUSTEP:Mbase} +LIB_DEPENDS+= libgnustep-base.so:${PORTSDIR}/lang/gnustep-base +. endif + +. if ${USE_GNUSTEP:Mbuild} +PATH:= ${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}:${PATH} +MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +BUILD_DEPENDS+= gnustep-make>0:${PORTSDIR}/devel/gnustep-make +.include "${USESDIR}/objc.mk" +. endif + +. if ${USE_GNUSTEP:Mgui} +LIB_DEPENDS+= libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui +. endif + +. if ${USE_GNUSTEP:Mback} +BUILD_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back +RUN_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back +. endif + +.endif + +.endif Property changes on: Mk/Uses/gnustep.mk ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property