diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-11-20 02:05:28 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-11-20 02:05:28 +0000 |
| commit | 818aedf9f2570f4ea99af6ec79ca70320e7c01f5 (patch) | |
| tree | fe83b170bb4667f8c81e6e1eb7cbda5609c3e5a8 | |
| parent | d39f7b712544658f3c2e5dc23ec6ee4edea20ec2 (diff) | |
| download | freebsd-ports-818aedf9f2570f4ea99af6ec79ca70320e7c01f5.zip | |
o Make sure gmake upholds the port's system environment variables
C{C,XX}
o Properly link against wxgtk 2.6
o Bump PORTREVISION
| -rw-r--r-- | net-p2p/xmule/Makefile | 6 | ||||
| -rw-r--r-- | net/xmule/Makefile | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile index 2e0f9d35a59c..05bc65252962 100644 --- a/net-p2p/xmule/Makefile +++ b/net-p2p/xmule/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmule DISTVERSION= 1.12.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} #MASTER_SITES= http://download.berlios.de/%SUBDIR%/ @@ -38,6 +39,7 @@ CONFIGURE_ARGS= --without-included-gettext \ --with-wx-config=${WX_CONFIG} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" +MAKE_ARGS= -e MAKE_ENV= CC="${CC}" CXX="${CXX}" # for debugging purposes @@ -98,6 +100,10 @@ post-patch: -e 's|<stdint.h>|<inttypes.h>|' \ ${WRKSRC}/${file} .endfor +# wx-config -> ${WX_CONFIG} + @${REINPLACE_CMD} -E \ + -e 's|wx-config|${WX_CONFIG}|' \ + ${WRKSRC}/src/xmule.make.in pre-configure: @${FIND} ${WRKSRC} -type f -name "Makefile.in" | \ diff --git a/net/xmule/Makefile b/net/xmule/Makefile index 2e0f9d35a59c..05bc65252962 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmule DISTVERSION= 1.12.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} #MASTER_SITES= http://download.berlios.de/%SUBDIR%/ @@ -38,6 +39,7 @@ CONFIGURE_ARGS= --without-included-gettext \ --with-wx-config=${WX_CONFIG} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" +MAKE_ARGS= -e MAKE_ENV= CC="${CC}" CXX="${CXX}" # for debugging purposes @@ -98,6 +100,10 @@ post-patch: -e 's|<stdint.h>|<inttypes.h>|' \ ${WRKSRC}/${file} .endfor +# wx-config -> ${WX_CONFIG} + @${REINPLACE_CMD} -E \ + -e 's|wx-config|${WX_CONFIG}|' \ + ${WRKSRC}/src/xmule.make.in pre-configure: @${FIND} ${WRKSRC} -type f -name "Makefile.in" | \ |