- Fix WANTLIBs.

- Fix linking with libiconv and libintl.
- Don't install stuff to /etc

'looks good' steven@
This commit is contained in:
bernd 2006-11-23 17:29:58 +00:00
parent 42eb3262c7
commit 3a9f89cf7d
3 changed files with 46 additions and 7 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.42 2006/11/03 17:01:10 espie Exp $
# $OpenBSD: Makefile,v 1.43 2006/11/23 17:29:58 bernd Exp $
COMMENT= "themed window manager"
DISTNAME= enlightenment-0.16.7.2
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
DOCS= enlightenment-docs-0.16.7
THEMES= enlightenment-theme-BlueSteel-0.16 \
enlightenment-theme-BrushedMetal-Tigert-0.16 \
@ -41,11 +41,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LIB_DEPENDS= esd.>=2::audio/esound \
Imlib2.>=2::graphics/imlib2
WANTLIB= ICE SM X11 Xext Xinerama Xxf86vm \
audiofile bz2 c iconv freetype intl jpeg \
ltdl m png tiff ungif z
MODULES= converters/libiconv \
devel/gettext
WANTLIB= ICE SM X11 Xext Xinerama Xxf86vm audiofile c freetype m
MODULES= devel/gettext
post-configure:
@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.3 2006/11/23 17:29:58 bernd Exp $
--- configure.orig Thu Nov 23 10:34:05 2006
+++ configure Thu Nov 23 10:34:42 2006
@@ -10721,7 +10721,7 @@ _ACEOF
- INTLLIBS="$LIBINTL"
+ INTLLIBS="$LTLIBINTL"
@@ -12591,7 +12591,7 @@ s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@GLIBC21@,$GLIBC21,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@INTLBISON@,$INTLBISON,;t t
s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
@@ -12603,7 +12603,7 @@ s,@GENCAT@,$GENCAT,;t t
s,@INTLOBJS@,$INTLOBJS,;t t
s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@ENABLE_EWMH_TRUE@,$ENABLE_EWMH_TRUE,;t t

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-misc_Makefile_in,v 1.1 2006/11/23 17:29:58 bernd Exp $
--- misc/Makefile.in.orig Thu Nov 23 10:43:36 2006
+++ misc/Makefile.in Thu Nov 23 10:43:36 2006
@@ -384,7 +384,7 @@ info: info-am
info-am:
-install-data-am: install-miscDATA install-sesmDATA
+install-data-am: install-miscDATA
install-exec-am: install-binSCRIPTS