Index: head/devel/gnustep-make/Makefile =================================================================== --- head/devel/gnustep-make/Makefile (revision 159129) +++ head/devel/gnustep-make/Makefile (revision 159130) @@ -1,55 +1,37 @@ # New ports collection makefile for: gnustep-make # Date created: 17 April 2001 # Whom: Thomas Gellekum # # $FreeBSD$ # PORTNAME= gnustep-make PORTVERSION= 1.12.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep makefile package GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \ CFLAGS="${CFLAGS}" CONFIGURE_TARGET= USE_GMAKE= yes USE_GNUSTEP= yes USE_GNUSTEP_PREFIX= yes MAKEFILE= MAKE_FLAGS= OPTFLAG="${CFLAGS}" CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS+= --with-thread-lib="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --with-config-file=${PREFIX}/GNUstep.conf .if defined(GNUSTEP_WITH_BASE_GCC) GNUSTEP_WITHOUT_LIBOBJC= yes .endif -.include - -.if !defined(GNUSTEP_WITH_BASE_GCC) -pre-configure: - @if test ! -f "${TARGLIB}/libobjc.so"; then \ - ${ECHO_MSG} "libobjc.so not found, please update your gcc"; \ - ${FALSE}; \ - fi; \ - if test `${LDCONFIG} -r | ${GREP} "${TARGLIB}/libobjc.so" | wc -l` -eq 0; then \ - ${ECHO_MSG} "trying to fix ldconfig.hints"; \ - ${LDCONFIG} -f "${WRKDIR}/ldconfig.hints" -m "${TARGLIB}";\ - if test `${LDCONFIG} -f "${WRKDIR}/ldconfig.hints" -r | ${GREP} "${TARGLIB}/libobjc.so" | wc -l` -eq 0; then \ - ${ECHO_MSG} "libobjc.so not in path"; \ - ${FALSE}; \ - fi; \ - fi; -.endif - post-install: ${LN} -s Library/Makefiles ${PREFIX}/System/ -.include +.include Property changes on: head/devel/gnustep-make/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.67 \ No newline at end of property +1.68 \ No newline at end of property Index: head/lang/gnustep-base/Makefile =================================================================== --- head/lang/gnustep-base/Makefile (revision 159129) +++ head/lang/gnustep-base/Makefile (revision 159130) @@ -1,92 +1,87 @@ # New ports collection makefile for: gnustep-base # Date created: 17 April 2001 # Whom: Thomas Gellekum # # $FreeBSD$ # PORTNAME= gnustep-base PORTVERSION= 1.12.0 CATEGORIES= lang devel MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep Foundation library LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4 ETCDIR= ${LOCALBASE}/etc USE_AUTOTOOLS= autoconf:259 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs CONFIGURE_TARGET= USE_GMAKE= yes USE_GNUSTEP= yes USE_GNUSTEP_PREFIX= yes USE_GNUSTEP_CONFIGURE= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes USE_ICONV= yes MAKEFILE= MAKE_FLAGS= OPTFLAG="${CFLAGS}" CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml BREAKS_IF_PEDANTIC= yes NO_FILTER_SHLIBS= yes PLIST_SUB+= LOCALBASE=${LOCALBASE} .if defined(WITHOUT_OPENSSL) CONFIGURE_ARGS+= --disable-openssl PLIST_SUB+= OPENSSL="@comment " .else USE_OPENSSL= yes PLIST_SUB+= OPENSSL="" MAKE_APPS= SSL INSTALL_APPS= SSL .endif .if !defined(WITHOUT_GNUSTEP_FAKEMAIN) CONFIGURE_ARGS+= --enable-fake-main .endif PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} EXTRA_PATCHES+= ${FILESDIR}/NSFileManager.m.patch .include PATH:= ${PREFIX}/System/Tools:${PATH} -.if !defined(GNUSTEP_WITH_BASE_GCC) -pre-configure: - ${LDCONFIG} -m ${TARGLIB} -.endif - post-build: .for i in ${MAKE_APPS} (cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}) .endfor post-extract: @${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" \ - -e "s=%%TARGLIB%%=${TARGLIB}=" ${FILESDIR}/GNUstep.sh \ + ${FILESDIR}/GNUstep.sh \ > ${WRKSRC}/GNUstep.sh post-install: -@${MKDIR} ${ETCDIR}/rc.d ${INSTALL_SCRIPT} ${WRKSRC}/GNUstep.sh ${ETCDIR}/rc.d/GNUstep.sh ${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR} .for i in ${INSTALL_APPS} (cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} -d ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .endfor ${RM} ${PREFIX}/System/Library/Libraries/libgnustep-base.so ${LN} -s libgnustep-base.so.${PORTVERSION} \ ${PREFIX}/System/Library/Libraries/libgnustep-base.so test: @(cd ${WRKSRC}/Testing && . ${SYSTEMDIR}/Makefiles/GNUstep.sh; ${GMAKE}) .include Property changes on: head/lang/gnustep-base/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.73 \ No newline at end of property +1.74 \ No newline at end of property Index: head/lang/gnustep-base/files/GNUstep.sh =================================================================== --- head/lang/gnustep-base/files/GNUstep.sh (revision 159129) +++ head/lang/gnustep-base/files/GNUstep.sh (revision 159130) @@ -1,30 +1,29 @@ #!/bin/sh PREFIX=%%PREFIX%% IFFILE=${PREFIX}/etc/gdomap_if PIDFILE="/var/run/gdomap.pid" GNUSTEP_SYSTEM_ROOT="${PREFIX}/GNUstep/System" case "$1" in start) if [ -e ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh ]; then - ldconfig -m %%TARGLIB%% . ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh rm -f ${PIDFILE} opentool gdomap -a ${IFFILE} -I ${PIDFILE} opentool gdnc echo -n ' GNUstep' fi ;; stop) [ -r ${PIDFILE} ] && kill $(cat ${PIDFILE}) && echo -n ' GNUstep' killall gdnc rm -f ${PIDFILE} ;; *) echo "Usage: ${0##*/} { start | stop }" >&2 exit 64 ;; esac exit 0 Property changes on: head/lang/gnustep-base/files/GNUstep.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property