cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fix static linking: -lXpm requires -lX11, and -lX11 requires -lXdmcp -lXau

Browse Source 
* sync wantlib
This commit is contained in:
naddy 2009-03-23 21:41:44 +00:00
parent 03806d347c
commit 9bc9f251cc
4 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/xdmchoose/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2007/09/15 20:04:26 merdely Exp $
# $OpenBSD: Makefile,v 1.8 2009/03/23 21:41:44 naddy Exp $
COMMENT= alternative xdm-invoked chooser
DISTNAME= xdmchoose-1.2.1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= x11
HOMEPAGE= http://frmb.org/xdmchoose.html
@ -14,7 +14,8 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xdmcp Xpm c
WANTLIB= X11 Xau Xdmcp Xpm c
MASTER_SITES= http://frmb.org/download/

25
x11/xdmchoose/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-Makefile_in,v 1.1 2009/03/23 21:41:44 naddy Exp $
--- Makefile.in.orig Thu Apr 24 03:41:13 2003
+++ Makefile.in Mon Mar 23 22:32:09 2009
@@ -87,7 +87,7 @@ install_sh = @install_sh@
AUTOMAKE_OPTIONS = foreign
-LDADD = -lXdmcp -lX11
+LDADD = -lX11 -lXdmcp -lXau
bin_PROGRAMS = xdmchooser xdmping
xdmchooser_SOURCES = cfg.c gadgets.h gadgets.c interface.h version.h \
@@ -194,10 +194,10 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
xdmchooser$(EXEEXT): $(xdmchooser_OBJECTS) $(xdmchooser_DEPENDENCIES)
@rm -f xdmchooser$(EXEEXT)
- $(LINK) $(xdmchooser_LDFLAGS) $(xdmchooser_OBJECTS) $(xdmchooser_LDADD) $(LIBS)
+ $(LINK) $(xdmchooser_LDFLAGS) $(xdmchooser_OBJECTS) $(LIBS) $(xdmchooser_LDADD)
xdmping$(EXEEXT): $(xdmping_OBJECTS) $(xdmping_DEPENDENCIES)
@rm -f xdmping$(EXEEXT)
- $(LINK) $(xdmping_LDFLAGS) $(xdmping_OBJECTS) $(xdmping_LDADD) $(LIBS)
+ $(LINK) $(xdmping_LDFLAGS) $(xdmping_OBJECTS) $(LIBS) $(xdmping_LDADD)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core

12
x11/xdmchoose/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2009/03/23 21:41:44 naddy Exp $
--- configure.orig Mon Mar 23 22:27:21 2009
+++ configure Mon Mar 23 22:28:21 2009
@@ -4905,7 +4905,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_XpmReadFileToPixmap" = no; then
for ac_lib in Xpm; do
- LIBS="-l$ac_lib $X_LIBS -lX11 $ac_func_search_save_LIBS"
+ LIBS="-l$ac_lib $X_LIBS -lX11 -lXdmcp -lXau $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */

8
x11/xdmchoose/patches/patch-xdmchoose_conf_5
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xdmchoose_conf_5,v 1.1 2003/05/12 20:11:28 naddy Exp $
--- xdmchoose.conf.5.orig Mon May 12 11:58:40 2003
+++ xdmchoose.conf.5 Mon May 12 11:58:51 2003
@@ -62,7 +62,7 @@ Visual components are configured using t
$OpenBSD: patch-xdmchoose_conf_5,v 1.2 2009/03/23 21:41:44 naddy Exp $
--- xdmchoose.conf.5.orig Thu Apr 24 03:40:56 2003
+++ xdmchoose.conf.5 Mon Mar 23 22:04:59 2009
@@ -62,7 +62,7 @@ Visual components are configured using the following p
\fBforeground\fR \fIstring\fR
foreground colour. This can be any X-understood colour spec - either a name in the colour database (\fIXlib Volume 1\fR) or a #RRGGBB style definition.
.TP